emmapeel

Resource updated

The “wiki/src/support/faq.de.po” file was changed. 06/12/2018
emmapeel

Resource updated

The “wiki/src/support/faq.es.po” file was changed. 06/12/2018
emmapeel

Repository merge failed

Auto-merging wiki/src/upgrade.it.po
CONFLICT (content): Merge conflict in wiki/src/upgrade.it.po
Auto-merging wiki/src/upgrade.fr.po
CONFLICT (content): Merge conflict in wiki/src/upgrade.fr.po
Auto-merging wiki/src/upgrade.fa.po
Auto-merging wiki/src/upgrade.de.po
CONFLICT (content): Merge conflict in wiki/src/upgrade.de.po
Removing wiki/src/torrents/files/tails-amd64-3.7.torrent
Removing wiki/src/torrents/files/tails-amd64-3.7.iso.sig
Auto-merging wiki/src/torrents/files/tails-amd64-3.7.1.packages
Auto-merging wiki/src/torrents/files/tails-amd64-3.7.1.build-manifest
Auto-merging wiki/src/support/known_issues.pt.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.pt.po
Auto-merging wiki/src/support/known_issues.it.po
Auto-merging wiki/src/support/known_issues.fa.po
Auto-merging wiki/src/support/faq.it.po
Auto-merging wiki/src/support/faq.fa.po
Auto-merging wiki/src/support/faq.es.po
CONFLICT (content): Merge conflict in wiki/src/support/faq.es.po
Auto-merging wiki/src/support/faq.de.po
CONFLICT (content): Merge conflict in wiki/src/support/faq.de.po
Auto-merging wiki/src/security/Numerous_security_holes_in_3.6.2.fr.po
CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.6.2.fr.po
Auto-merging wiki/src/security/Numerous_security_holes_in_3.6.2.de.po
CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.6.2.de.po
Auto-merging wiki/src/news/version_3.7.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.fr.po
Auto-merging wiki/src/news/version_3.7.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.de.po
Auto-merging wiki/src/news/version_3.6.2.pt.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.pt.po
Auto-merging wiki/src/doc/first_steps/upgrade.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/upgrade.de.po
Auto-merging wiki/src/doc/first_steps/shutdown.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/shutdown.de.po
Auto-merging wiki/src/doc/first_steps/reset.intro.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/reset.intro.de.po
Auto-merging wiki/src/doc/first_steps/reset.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/reset.de.po
Auto-merging wiki/src/doc/first_steps/bug_reporting.it.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/bug_reporting.it.po
Auto-merging wiki/src/doc/first_steps/bug_reporting.fa.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/bug_reporting.fa.po
Auto-merging wiki/src/doc/first_steps/bug_reporting.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/bug_reporting.de.po
Auto-merging wiki/src/doc/anonymous_internet/networkmanager.it.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/networkmanager.it.po
Removing wiki/src/blueprint/SponsorW/2018_05.mdwn
Auto-merging po/de.po
CONFLICT (content): Merge conflict in po/de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
06/12/2018
emmapeel

Repository merge failed

Auto-merging wiki/src/support/known_issues/graphics.es.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues/graphics.es.po
Auto-merging wiki/src/partners.de.po
CONFLICT (content): Merge conflict in wiki/src/partners.de.po
Auto-merging wiki/src/news/test_asp-beta.pt.po
CONFLICT (content): Merge conflict in wiki/src/news/test_asp-beta.pt.po
Auto-merging wiki/src/news/test_asp-beta.it.po
CONFLICT (content): Merge conflict in wiki/src/news/test_asp-beta.it.po
Auto-merging wiki/src/news/test_asp-beta.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/test_asp-beta.fr.po
Auto-merging wiki/src/news/test_asp-beta.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/test_asp-beta.fa.po
Auto-merging wiki/src/news/test_asp-beta.es.po
CONFLICT (content): Merge conflict in wiki/src/news/test_asp-beta.es.po
Automatic merge failed; fix conflicts and then commit the result. (1)
05/30/2018
emmapeel

Changes pushed

Changes pushed 05/27/2018
emmapeel

Changes pushed

Changes pushed 05/27/2018
emmapeel

Resource updated

The “wiki/src/doc/first_steps.index.de.po” file was changed. 05/27/2018
emmapeel

Repository merged

Repository merged

Original revision: N/A
New revision: N/A 05/27/2018
emmapeel

Changes pushed

Changes pushed 05/25/2018
emmapeel

Changes pushed

Changes pushed 05/25/2018
emmapeel

Repository merged

Repository merged

Original revision: N/A
New revision: N/A 05/25/2018
emmapeel

Changes pushed

Changes pushed 05/25/2018
emmapeel

Changes pushed

Changes pushed 05/25/2018
emmapeel

Repository merged

Repository merged

Original revision: N/A
New revision: N/A 05/25/2018
emmapeel

Changes pushed

Changes pushed 05/24/2018
emmapeel

Changes pushed

Changes pushed 05/24/2018
emmapeel

Repository merged

Repository merged

Original revision: N/A
New revision: N/A 05/24/2018
emmapeel

Changes pushed

Changes pushed 05/24/2018
emmapeel

Changes pushed

Changes pushed 05/24/2018
emmapeel

Changes pushed

Changes pushed 05/24/2018

Search