None

Repository merge failed

Auto-merging wiki/src/support/known_issues.pt.po
Auto-merging wiki/src/support/known_issues.it.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.it.po
Auto-merging wiki/src/support/known_issues.fr.po
Auto-merging wiki/src/support/known_issues.fa.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fa.po
Auto-merging wiki/src/support/known_issues.de.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po
Auto-merging wiki/src/support/faq.it.po
CONFLICT (content): Merge conflict in 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
CONFLICT (content): Merge conflict in wiki/src/support/faq.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
11/18/2018
None

Repository merge failed

Auto-merging wiki/src/support/known_issues.pt.po
Auto-merging wiki/src/support/known_issues.it.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.it.po
Auto-merging wiki/src/support/known_issues.fr.po
Auto-merging wiki/src/support/known_issues.fa.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fa.po
Auto-merging wiki/src/support/known_issues.de.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po
Auto-merging wiki/src/support/faq.it.po
CONFLICT (content): Merge conflict in 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
CONFLICT (content): Merge conflict in wiki/src/support/faq.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
11/18/2018
None

Repository merge failed

Auto-merging wiki/src/support/known_issues.pt.po
Auto-merging wiki/src/support/known_issues.it.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.it.po
Auto-merging wiki/src/support/known_issues.fr.po
Auto-merging wiki/src/support/known_issues.fa.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fa.po
Auto-merging wiki/src/support/known_issues.de.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po
Auto-merging wiki/src/support/faq.it.po
CONFLICT (content): Merge conflict in 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
CONFLICT (content): Merge conflict in wiki/src/support/faq.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
11/18/2018
None

Repository merge failed

Auto-merging wiki/src/support/known_issues.pt.po
Auto-merging wiki/src/support/known_issues.it.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.it.po
Auto-merging wiki/src/support/known_issues.fr.po
Auto-merging wiki/src/support/known_issues.fa.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fa.po
Auto-merging wiki/src/support/known_issues.de.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po
Auto-merging wiki/src/support/faq.it.po
CONFLICT (content): Merge conflict in 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
CONFLICT (content): Merge conflict in wiki/src/support/faq.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
11/18/2018
None

Repository merge failed

Auto-merging wiki/src/support/known_issues.pt.po
Auto-merging wiki/src/support/known_issues.it.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.it.po
Auto-merging wiki/src/support/known_issues.fr.po
Auto-merging wiki/src/support/known_issues.fa.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fa.po
Auto-merging wiki/src/support/known_issues.de.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po
Auto-merging wiki/src/support/faq.it.po
CONFLICT (content): Merge conflict in 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
CONFLICT (content): Merge conflict in wiki/src/support/faq.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
11/18/2018
None

Repository merge failed

Auto-merging wiki/src/support/known_issues.pt.po
Auto-merging wiki/src/support/known_issues.it.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.it.po
Auto-merging wiki/src/support/known_issues.fr.po
Auto-merging wiki/src/support/known_issues.fa.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fa.po
Auto-merging wiki/src/support/known_issues.de.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po
Auto-merging wiki/src/support/faq.it.po
CONFLICT (content): Merge conflict in 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
CONFLICT (content): Merge conflict in wiki/src/support/faq.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
11/18/2018
None

Repository merge failed

Auto-merging wiki/src/support/known_issues.pt.po
Auto-merging wiki/src/support/known_issues.it.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.it.po
Auto-merging wiki/src/support/known_issues.fr.po
Auto-merging wiki/src/support/known_issues.fa.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fa.po
Auto-merging wiki/src/support/known_issues.de.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po
Auto-merging wiki/src/support/faq.it.po
CONFLICT (content): Merge conflict in 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
CONFLICT (content): Merge conflict in wiki/src/support/faq.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
11/18/2018
None

Repository merge failed

Auto-merging wiki/src/support/known_issues.pt.po
Auto-merging wiki/src/support/known_issues.it.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.it.po
Auto-merging wiki/src/support/known_issues.fr.po
Auto-merging wiki/src/support/known_issues.fa.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fa.po
Auto-merging wiki/src/support/known_issues.de.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po
Auto-merging wiki/src/support/faq.it.po
CONFLICT (content): Merge conflict in 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
CONFLICT (content): Merge conflict in wiki/src/support/faq.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
11/18/2018
emmapeel

Changes pushed

Changes pushed 11/18/2018
None

Changes pushed

Changes pushed 11/17/2018
None

Repository merged

Repository merged

Original revision: N/A
New revision: N/A 11/17/2018
None

Changes pushed

Changes pushed 11/17/2018
None

Repository merged

Repository merged

Original revision: N/A
New revision: N/A 11/17/2018
emmapeel

Changes pushed

Changes pushed 11/16/2018
None

Repository merge failed

Auto-merging wiki/src/support/known_issues.fr.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fr.po
Auto-merging wiki/src/doc/encryption_and_privacy/luks_vs_veracrypt.inline.fr.po
Automatic merge failed; fix conflicts and then commit the result. (1)
11/15/2018
None

Repository merge failed

Auto-merging wiki/src/support/known_issues.fr.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fr.po
Auto-merging wiki/src/doc/encryption_and_privacy/luks_vs_veracrypt.inline.fr.po
Automatic merge failed; fix conflicts and then commit the result. (1)
11/15/2018
None

Repository merge failed

Auto-merging wiki/src/support/known_issues.fr.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fr.po
Auto-merging wiki/src/doc/encryption_and_privacy/luks_vs_veracrypt.inline.fr.po
Automatic merge failed; fix conflicts and then commit the result. (1)
11/15/2018
None

Repository merge failed

Auto-merging wiki/src/support/known_issues.fr.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fr.po
Auto-merging wiki/src/doc/encryption_and_privacy/luks_vs_veracrypt.inline.fr.po
Automatic merge failed; fix conflicts and then commit the result. (1)
11/15/2018
None

Repository merge failed

Auto-merging wiki/src/support/known_issues.fr.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fr.po
Auto-merging wiki/src/doc/encryption_and_privacy/luks_vs_veracrypt.inline.fr.po
Automatic merge failed; fix conflicts and then commit the result. (1)
11/15/2018
None

Repository merge failed

Auto-merging wiki/src/support/known_issues.fr.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fr.po
Auto-merging wiki/src/doc/encryption_and_privacy/luks_vs_veracrypt.inline.fr.po
Automatic merge failed; fix conflicts and then commit the result. (1)
11/15/2018

Search