|
None
Changes committed |
Changes committed
07/14/2016
|
|
emmapeel
Changes pushed |
Changes pushed
07/14/2016
|
|
emmapeel
Changes pushed |
Changes pushed
07/14/2016
|
|
emmapeel
Changes pushed |
Changes pushed
07/14/2016
|
|
emmapeel
Repository merge failed |
Removing wiki/src/news/test_2.4-rc1.pt.po Removing wiki/src/news/test_2.4-rc1.it.po Removing wiki/src/news/test_2.4-rc1.fr.po Removing wiki/src/news/test_2.4-rc1.fa.po Removing wiki/src/news/test_2.4-rc1.de.po Removing wiki/src/news/test_2.2-rc1.pt.po Removing wiki/src/news/test_2.2-rc1.it.po Removing wiki/src/news/test_2.2-rc1.fr.po Removing wiki/src/news/test_2.2-rc1.fa.po Removing wiki/src/news/test_2.2-rc1.de.po Removing wiki/src/news/test_2.0-rc1.pt.po Removing wiki/src/news/test_2.0-rc1.it.po Removing wiki/src/news/test_2.0-rc1.fr.po Removing wiki/src/news/test_2.0-rc1.fa.po Removing wiki/src/news/test_2.0-rc1.de.po Removing wiki/src/news/test_1.7-rc1.pt.po Removing wiki/src/news/test_1.7-rc1.it.po Removing wiki/src/news/test_1.7-rc1.fr.po Removing wiki/src/news/test_1.7-rc1.fa.po Removing wiki/src/news/test_1.7-rc1.de.po Removing wiki/src/news/test_1.5-rc1.pt.po Removing wiki/src/news/test_1.5-rc1.it.po Removing wiki/src/news/test_1.5-rc1.fr.po Removing wiki/src/news/test_1.5-rc1.fa.po Removing wiki/src/news/test_1.5-rc1.de.po Removing wiki/src/news/test_1.4-rc1.pt.po Removing wiki/src/news/test_1.4-rc1.it.po CONFLICT (modify/delete): wiki/src/news/test_1.4-rc1.fr.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/test_1.4-rc1.fr.po left in tree. Removing wiki/src/news/test_1.4-rc1.fa.po Removing wiki/src/news/test_1.4-rc1.de.po Removing wiki/src/news/test_1.3-rc1.pt.po Removing wiki/src/news/test_1.3-rc1.it.po CONFLICT (modify/delete): wiki/src/news/test_1.3-rc1.fr.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/test_1.3-rc1.fr.po left in tree. Removing wiki/src/news/test_1.3-rc1.fa.po Removing wiki/src/news/test_1.3-rc1.de.po Removing wiki/src/news/test_1.2-rc1.pt.po Removing wiki/src/news/test_1.2-rc1.it.po CONFLICT (modify/delete): wiki/src/news/test_1.2-rc1.fr.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/test_1.2-rc1.fr.po left in tree. Removing wiki/src/news/test_1.2-rc1.fa.po Removing wiki/src/news/test_1.2-rc1.de.po Removing wiki/src/news/test_1.1-rc1.pt.po Removing wiki/src/news/test_1.1-rc1.it.po CONFLICT (modify/delete): wiki/src/news/test_1.1-rc1.fr.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/test_1.1-rc1.fr.po left in tree. Removing wiki/src/news/test_1.1-rc1.fa.po Removing wiki/src/news/test_1.1-rc1.de.po Removing wiki/src/news/test_1.0-rc1.pt.po Removing wiki/src/news/test_1.0-rc1.it.po CONFLICT (modify/delete): wiki/src/news/test_1.0-rc1.fr.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/test_1.0-rc1.fr.po left in tree. Removing wiki/src/news/test_1.0-rc1.fa.po Removing wiki/src/news/test_1.0-rc1.de.po Auto-merging ikiwiki.setup CONFLICT (content): Merge conflict in ikiwiki.setup Automatic merge failed; fix conflicts and then commit the result. (1)07/13/2016 |
|
emmapeel
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 07/13/2016 |
|
emmapeel
Changes pushed |
Changes pushed
07/13/2016
|
|
emmapeel
Resource updated |
The “
wiki/src/index.fa.po” file was changed.
07/13/2016
|
|
emmapeel
Resource updated |
The “
wiki/src/index.pt.po” file was changed.
07/13/2016
|
|
emmapeel
Resource updated |
The “
wiki/src/index.it.po” file was changed.
07/13/2016
|
|
emmapeel
Resource updated |
The “
wiki/src/index.fr.po” file was changed.
07/13/2016
|
|
emmapeel
Resource updated |
The “
wiki/src/index.de.po” file was changed.
07/13/2016
|
|
emmapeel
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 07/13/2016 |
|
emmapeel
Changes pushed |
Changes pushed
07/13/2016
|
|
emmapeel
Changes pushed |
Changes pushed
07/13/2016
|
|
emmapeel
Changes pushed |
Changes pushed
07/13/2016
|
|
None
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 03/31/2016 |
|
emmapeel
Translation uploaded |
Translation uploaded
03/14/2016
|
|
None
Changes committed |
Changes committed
03/14/2016
|
|
emmapeel
Translation uploaded |
Translation uploaded
03/14/2016
|