emmapeel

Changes pushed

Changes pushed 04/08/2018
emmapeel

Changes pushed

Changes pushed 04/08/2018
None

Changes pushed

Changes pushed 04/08/2018
None

Changes pushed

Changes pushed 04/08/2018
emmapeel

Changes pushed

Changes pushed 04/08/2018
emmapeel

Changes pushed

Changes pushed 04/08/2018
None

Changes pushed

Changes pushed 04/08/2018
None

Changes pushed

Changes pushed 04/08/2018
None

Changes pushed

Changes pushed 04/08/2018
None

Resource updated

The “wiki/src/index.de.po” file was changed. 04/08/2018
None

Repository merge failed

Auto-merging wiki/src/news/version_3.6.2.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.fr.po
Auto-merging wiki/src/news/duckduckgo_challenge.de.po
CONFLICT (content): Merge conflict in wiki/src/news/duckduckgo_challenge.de.po
Auto-merging wiki/src/doc/first_steps/startup_options/administration_password.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/administration_password.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
04/08/2018
emmapeel

Repository merge failed

Auto-merging wiki/src/news/version_3.6.2.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.fr.po
Auto-merging wiki/src/doc/first_steps/startup_options/administration_password.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/administration_password.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
04/08/2018
emmapeel

Repository merge failed

Auto-merging wiki/src/news/version_3.6.2.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.fr.po
Auto-merging wiki/src/doc/first_steps/startup_options/administration_password.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/administration_password.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
04/08/2018
emmapeel

Changes pushed

Changes pushed 04/07/2018
emmapeel

Changes pushed

Changes pushed 04/07/2018
cacu

Repository merge failed

Auto-merging wiki/src/partners.de.po
CONFLICT (content): Merge conflict in wiki/src/partners.de.po
Auto-merging wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po
Auto-merging wiki/src/doc/first_steps/startup_options.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options.de.po
Auto-merging wiki/src/doc/anonymous_internet/electrum.pt.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/electrum.pt.po
Auto-merging wiki/src/doc/anonymous_internet/electrum.it.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/electrum.it.po
Auto-merging wiki/src/doc/anonymous_internet/electrum.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/electrum.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
04/07/2018
emmapeel

Changes pushed

Changes pushed 04/06/2018
emmapeel

Changes pushed

Changes pushed 04/06/2018
emmapeel

Repository merged

Repository merged

Original revision: N/A
New revision: N/A 04/06/2018
emmapeel

Changes pushed

Changes pushed 04/05/2018

Search