emmapeel

Changes pushed

Changes pushed 7 years ago
emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Changes pushed

Changes pushed 7 years ago
emmapeel

Changes pushed

Changes pushed 7 years ago
emmapeel

Repository merged

Repository merged

Original revision: N/A
New revision: N/A 7 years ago
emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Changes pushed

Changes pushed 7 years ago
emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Repository merge failed

Auto-merging wiki/src/support/faq.it.po
Auto-merging wiki/src/support/faq.fa.po
Auto-merging wiki/src/support/faq.es.po
Auto-merging wiki/src/support/faq.de.po
Auto-merging wiki/src/support.it.po
CONFLICT (content): Merge conflict in wiki/src/support.it.po
Auto-merging wiki/src/support.fa.po
CONFLICT (content): Merge conflict in wiki/src/support.fa.po
Auto-merging wiki/src/support.de.po
CONFLICT (content): Merge conflict in wiki/src/support.de.po
Removing wiki/src/security/Numerous_security_holes_in_3.9.mdwn~
Auto-merging wiki/src/security/Numerous_security_holes_in_3.9.it.po
Auto-merging wiki/src/security/Numerous_security_holes_in_3.9.fa.po
Auto-merging wiki/src/security/Numerous_security_holes_in_3.9.de.po
Auto-merging wiki/src/security/Numerous_security_holes_in_3.9.1.it.po
Auto-merging wiki/src/security/Numerous_security_holes_in_3.9.1.fr.po
CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.9.1.fr.po
Auto-merging wiki/src/security/Numerous_security_holes_in_3.9.1.fa.po
Auto-merging wiki/src/security/Numerous_security_holes_in_3.9.1.es.po
Auto-merging wiki/src/security/Numerous_security_holes_in_3.9.1.de.po
Auto-merging wiki/src/security/Numerous_security_holes_in_3.8.it.po
Auto-merging wiki/src/security/Numerous_security_holes_in_3.8.fa.po
Auto-merging wiki/src/security/Numerous_security_holes_in_3.8.es.po
Auto-merging wiki/src/security/Numerous_security_holes_in_3.8.de.po
Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.it.po
Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.fr.po
Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.fa.po
Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.de.po
Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.it.po
Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.fr.po
Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.fa.po
Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.de.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.9.1.it.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.9.1.fr.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.9.1.fa.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.9.1.de.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.7.it.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.7.fr.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.7.fa.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.7.es.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.7.de.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.7.1.it.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.7.1.fr.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.7.1.fa.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.7.1.es.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.7.1.de.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.6.it.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.6.fr.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.6.fa.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.6.de.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.5.it.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.5.fr.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.5.fa.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.5.de.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.4.it.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.4.fr.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.4.fa.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.4.de.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.3.it.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.3.fr.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.3.fa.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.3.de.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.2.1.it.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.2.1.fr.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.2.1.fa.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.2.1.de.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.12.it.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.12.fr.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.12.fa.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.12.de.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.11.it.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.11.fr.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.11.fa.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.11.de.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.10.it.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.10.fr.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.10.fa.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.10.es.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.10.de.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.0.it.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.0.fr.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.0.fa.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.0.es.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.0.de.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.0.1.it.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.0.1.fr.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.0.1.fa.po
Auto-merging wiki/src/security/Numerous_security_holes_in_2.0.1.de.po
Auto-merging wiki/src/news/version_3.7.1.it.po
Auto-merging wiki/src/news/version_3.7.1.fr.po
Auto-merging wiki/src/news/version_3.7.1.de.po
Auto-merging wiki/src/doc/first_steps/persistence/configure.it.po
Auto-merging wiki/src/doc/first_steps/persistence/configure.fr.po
Auto-merging wiki/src/doc/first_steps/persistence/configure.fa.po
Auto-merging wiki/src/doc/first_steps/persistence/configure.es.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/persistence/configure.es.po
Auto-merging wiki/src/doc/first_steps/bug_reporting.it.po
Auto-merging wiki/src/doc/first_steps/bug_reporting.fa.po
Auto-merging wiki/src/doc/first_steps/bug_reporting.de.po
Auto-merging wiki/src/doc/encryption_and_privacy/veracrypt.pt.po
Auto-merging wiki/src/doc/encryption_and_privacy/veracrypt.fr.po
Auto-merging wiki/src/doc/encryption_and_privacy/veracrypt.fa.po
Auto-merging wiki/src/doc/encryption_and_privacy/veracrypt.es.po
Auto-merging wiki/src/doc/encryption_and_privacy/veracrypt.de.po
Auto-merging wiki/src/doc/encryption_and_privacy/luks_vs_veracrypt.inline.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/luks_vs_veracrypt.inline.fr.po
Auto-merging wiki/src/doc/about/openpgp_keys.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/openpgp_keys.de.po
Auto-merging wiki/src/doc/about/finances.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/finances.de.po
Auto-merging wiki/src/doc/about/acknowledgments_and_similar_projects.fa.po
Auto-merging wiki/src/contribute.it.po
Auto-merging wiki/src/contribute.fa.po
Auto-merging wiki/src/bugs.de.po
CONFLICT (content): Merge conflict in wiki/src/bugs.de.po
Auto-merging ikiwiki.setup
Auto-merging ikiwiki-cgi.setup
Automatic merge failed; fix conflicts and then commit the result. (1)
7 years ago
emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Changes pushed

Changes pushed 7 years ago
emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Changes committed

Changes committed 7 years ago

Search