emmapeel

Repository merge failed

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

Changes pushed

Changes pushed 02/25/2018
emmapeel

Changes pushed

Changes pushed 02/25/2018
emmapeel

Changes pushed

Changes pushed 02/25/2018
emmapeel

Repository merged

Repository merged

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

Changes pushed

Changes pushed 02/24/2018
emmapeel

Changes pushed

Changes pushed 02/24/2018
emmapeel

Changes pushed

Changes pushed 02/24/2018
emmapeel

Repository merged

Repository merged

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

Changes pushed

Changes pushed 02/23/2018
emmapeel

Repository merged

Repository merged

Original revision: N/A
New revision: N/A 02/23/2018
emmapeel

Changes pushed

Changes pushed 02/23/2018
emmapeel

Changes pushed

Changes pushed 02/23/2018
emmapeel

Changes pushed

Changes pushed 02/23/2018
emmapeel

Changes pushed

Changes pushed 02/23/2018
emmapeel

Changes pushed

Changes pushed 02/23/2018
emmapeel

Changes pushed

Changes pushed 02/22/2018
emmapeel

Changes pushed

Changes pushed 02/22/2018
emmapeel

Changes pushed

Changes pushed 02/22/2018
emmapeel

Changes pushed

Changes pushed 02/22/2018

Search