2. Changes

Removing wiki/src/security/Numerous_security_holes_in_1.8.pt.po
Removing wiki/src/security/Numerous_security_holes_in_1.8.it.po
Removing wiki/src/security/Numerous_security_holes_in_1.8.fr.po
Removing wiki/src/security/Numerous_security_holes_in_1.8.fa.po
Removing wiki/src/security/Numerous_security_holes_in_1.8.de.po
Removing wiki/src/security/Numerous_security_holes_in_1.8.2.pt.po
Removing wiki/src/security/Numerous_security_holes_in_1.8.2.it.po
Removing wiki/src/security/Numerous_security_holes_in_1.8.2.fr.po
Removing wiki/src/security/Numerous_security_holes_in_1.8.2.fa.po
Removing wiki/src/security/Numerous_security_holes_in_1.8.2.de.po
Removing wiki/src/security/Numerous_security_holes_in_1.8.1.pt.po
Removing wiki/src/security/Numerous_security_holes_in_1.8.1.it.po
Removing wiki/src/security/Numerous_security_holes_in_1.8.1.fr.po
Removing wiki/src/security/Numerous_security_holes_in_1.8.1.fa.po
Removing wiki/src/security/Numerous_security_holes_in_1.8.1.de.po
Removing wiki/src/security/Numerous_security_holes_in_1.7.pt.po
Removing wiki/src/security/Numerous_security_holes_in_1.7.it.po
Removing wiki/src/security/Numerous_security_holes_in_1.7.fr.po
Removing wiki/src/security/Numerous_security_holes_in_1.7.fa.po
Removing wiki/src/security/Numerous_security_holes_in_1.7.de.po
Removing wiki/src/security/Numerous_security_holes_in_1.6.pt.po
Removing wiki/src/security/Numerous_security_holes_in_1.6.it.po
Removing wiki/src/security/Numerous_security_holes_in_1.6.fr.po
Removing wiki/src/security/Numerous_security_holes_in_1.6.fa.po
Removing wiki/src/security/Numerous_security_holes_in_1.6.de.po
Removing wiki/src/security/Numerous_security_holes_in_1.5.pt.po
Removing wiki/src/security/Numerous_security_holes_in_1.5.it.po
Removing wiki/src/security/Numerous_security_holes_in_1.5.fr.po
Removing wiki/src/security/Numerous_security_holes_in_1.5.fa.po
Removing wiki/src/security/Numerous_security_holes_in_1.5.de.po
Removing wiki/src/security/Numerous_security_holes_in_1.5.1.pt.po
Removing wiki/src/security/Numerous_security_holes_in_1.5.1.it.po
Removing wiki/src/security/Numerous_security_holes_in_1.5.1.fr.po
Removing wiki/src/security/Numerous_security_holes_in_1.5.1.fa.po
Removing wiki/src/security/Numerous_security_holes_in_1.5.1.de.po
Removing wiki/src/security/Numerous_security_holes_in_1.4.pt.po
Removing wiki/src/security/Numerous_security_holes_in_1.4.it.po
Removing wiki/src/security/Numerous_security_holes_in_1.4.fr.po
Removing wiki/src/security/Numerous_security_holes_in_1.4.fa.po
Removing wiki/src/security/Numerous_security_holes_in_1.4.de.po
Removing wiki/src/security/Numerous_security_holes_in_1.4.1.pt.po
Removing wiki/src/security/Numerous_security_holes_in_1.4.1.it.po
Removing wiki/src/security/Numerous_security_holes_in_1.4.1.fr.po
Removing wiki/src/security/Numerous_security_holes_in_1.4.1.fa.po
Removing wiki/src/security/Numerous_security_holes_in_1.4.1.de.po
Removing wiki/src/security/Numerous_security_holes_in_1.3.pt.po
Removing wiki/src/security/Numerous_security_holes_in_1.3.it.po
Removing wiki/src/security/Numerous_security_holes_in_1.3.fr.po
Removing wiki/src/security/Numerous_security_holes_in_1.3.fa.po
Removing wiki/src/security/Numerous_security_holes_in_1.3.de.po
Removing wiki/src/security/Numerous_security_holes_in_1.3.2.pt.po
Removing wiki/src/security/Numerous_security_holes_in_1.3.2.it.po
Removing wiki/src/security/Numerous_security_holes_in_1.3.2.fr.po
Removing wiki/src/security/Numerous_security_holes_in_1.3.2.fa.po
Removing wiki/src/security/Numerous_security_holes_in_1.3.2.de.po
Removing wiki/src/security/Numerous_security_holes_in_1.3.1.pt.po
Removing wiki/src/security/Numerous_security_holes_in_1.3.1.it.po
Removing wiki/src/security/Numerous_security_holes_in_1.3.1.fr.po
Removing wiki/src/security/Numerous_security_holes_in_1.3.1.fa.po
Removing wiki/src/security/Numerous_security_holes_in_1.3.1.de.po
Removing wiki/src/security/Numerous_security_holes_in_1.2.pt.po
Removing wiki/src/security/Numerous_security_holes_in_1.2.it.po
Removing wiki/src/security/Numerous_security_holes_in_1.2.fr.po
Removing wiki/src/security/Numerous_security_holes_in_1.2.fa.po
Removing wiki/src/security/Numerous_security_holes_in_1.2.de.po
Removing wiki/src/security/Numerous_security_holes_in_1.2.3.pt.po
Removing wiki/src/security/Numerous_security_holes_in_1.2.3.it.po
Removing wiki/src/security/Numerous_security_holes_in_1.2.3.fr.po
Removing wiki/src/security/Numerous_security_holes_in_1.2.3.fa.po
Removing wiki/src/security/Numerous_security_holes_in_1.2.3.de.po
Removing wiki/src/security/Numerous_security_holes_in_1.2.2.pt.po
Removing wiki/src/security/Numerous_security_holes_in_1.2.2.it.po
Removing wiki/src/security/Numerous_security_holes_in_1.2.2.fr.po
Removing wiki/src/security/Numerous_security_holes_in_1.2.2.fa.po
Removing wiki/src/security/Numerous_security_holes_in_1.2.2.de.po
Removing wiki/src/security/Numerous_security_holes_in_1.1.pt.po
Removing wiki/src/security/Numerous_security_holes_in_1.1.it.po
Removing wiki/src/security/Numerous_security_holes_in_1.1.fr.po
Removing wiki/src/security/Numerous_security_holes_in_1.1.fa.po
Removing wiki/src/security/Numerous_security_holes_in_1.1.de.po
Removing wiki/src/security/Numerous_security_holes_in_1.1.2.pt.po
Removing wiki/src/security/Numerous_security_holes_in_1.1.2.it.po
Removing wiki/src/security/Numerous_security_holes_in_1.1.2.fr.po
Removing wiki/src/security/Numerous_security_holes_in_1.1.2.fa.po
Removing wiki/src/security/Numerous_security_holes_in_1.1.2.de.po
Removing wiki/src/security/Numerous_security_holes_in_1.1.1.pt.po
Removing wiki/src/security/Numerous_security_holes_in_1.1.1.it.po
Removing wiki/src/security/Numerous_security_holes_in_1.1.1.fr.po
Removing wiki/src/security/Numerous_security_holes_in_1.1.1.fa.po
Removing wiki/src/security/Numerous_security_holes_in_1.1.1.de.po
Removing wiki/src/security/Numerous_security_holes_in_1.0.pt.po
Removing wiki/src/security/Numerous_security_holes_in_1.0.it.po
Removing wiki/src/security/Numerous_security_holes_in_1.0.fr.po
Removing wiki/src/security/Numerous_security_holes_in_1.0.fa.po
Removing wiki/src/security/Numerous_security_holes_in_1.0.de.po
Removing wiki/src/security/Numerous_security_holes_in_1.0.1.pt.po
Removing wiki/src/security/Numerous_security_holes_in_1.0.1.it.po
Removing wiki/src/security/Numerous_security_holes_in_1.0.1.fr.po
Removing wiki/src/security/Numerous_security_holes_in_1.0.1.fa.po
Removing wiki/src/security/Numerous_security_holes_in_1.0.1.de.po
Removing wiki/src/news/version_1.8.pt.po
Removing wiki/src/news/version_1.8.it.po
Removing wiki/src/news/version_1.8.fr.po
Removing wiki/src/news/version_1.8.fa.po
Removing wiki/src/news/version_1.8.de.po
Removing wiki/src/news/version_1.8.2.pt.po
Removing wiki/src/news/version_1.8.2.it.po
Removing wiki/src/news/version_1.8.2.fr.po
Removing wiki/src/news/version_1.8.2.fa.po
Removing wiki/src/news/version_1.8.2.de.po
Removing wiki/src/news/version_1.8.1.pt.po
Removing wiki/src/news/version_1.8.1.it.po
Removing wiki/src/news/version_1.8.1.fr.po
Removing wiki/src/news/version_1.8.1.fa.po
Removing wiki/src/news/version_1.8.1.de.po
Removing wiki/src/news/version_1.7.pt.po
Removing wiki/src/news/version_1.7.it.po
Removing wiki/src/news/version_1.7.fr.po
Removing wiki/src/news/version_1.7.fa.po
Removing wiki/src/news/version_1.7.de.po
Removing wiki/src/news/version_1.6.pt.po
Removing wiki/src/news/version_1.6.it.po
Removing wiki/src/news/version_1.6.fr.po
Removing wiki/src/news/version_1.6.fa.po
Removing wiki/src/news/version_1.6.de.po
Removing wiki/src/news/version_1.5.pt.po
Removing wiki/src/news/version_1.5.it.po
Removing wiki/src/news/version_1.5.fr.po
Removing wiki/src/news/version_1.5.fa.po
CONFLICT (modify/delete): wiki/src/news/version_1.5.de.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/version_1.5.de.po left in tree.
Removing wiki/src/news/version_1.5.1.pt.po
Removing wiki/src/news/version_1.5.1.it.po
Removing wiki/src/news/version_1.5.1.fr.po
Removing wiki/src/news/version_1.5.1.fa.po
CONFLICT (modify/delete): wiki/src/news/version_1.5.1.de.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/version_1.5.1.de.po left in tree.
Removing wiki/src/news/version_1.4.pt.po
Removing wiki/src/news/version_1.4.it.po
Removing wiki/src/news/version_1.4.fr.po
Removing wiki/src/news/version_1.4.fa.po
CONFLICT (modify/delete): wiki/src/news/version_1.4.de.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/version_1.4.de.po left in tree.
Removing wiki/src/news/version_1.4.1.pt.po
Removing wiki/src/news/version_1.4.1.it.po
Removing wiki/src/news/version_1.4.1.fr.po
Removing wiki/src/news/version_1.4.1.fa.po
CONFLICT (modify/delete): wiki/src/news/version_1.4.1.de.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/version_1.4.1.de.po left in tree.
Removing wiki/src/news/version_1.3.pt.po
Removing wiki/src/news/version_1.3.it.po
Removing wiki/src/news/version_1.3.fr.po
Removing wiki/src/news/version_1.3.fa.po
Removing wiki/src/news/version_1.3.de.po
Removing wiki/src/news/version_1.3.2.pt.po
Removing wiki/src/news/version_1.3.2.it.po
Removing wiki/src/news/version_1.3.2.fr.po
Removing wiki/src/news/version_1.3.2.fa.po
CONFLICT (modify/delete): wiki/src/news/version_1.3.2.de.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/version_1.3.2.de.po left in tree.
Removing wiki/src/news/version_1.3.1.pt.po
Removing wiki/src/news/version_1.3.1.it.po
Removing wiki/src/news/version_1.3.1.fr.po
Removing wiki/src/news/version_1.3.1.fa.po
CONFLICT (modify/delete): wiki/src/news/version_1.3.1.de.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/version_1.3.1.de.po left in tree.
Removing wiki/src/news/version_1.2.pt.po
Removing wiki/src/news/version_1.2.it.po
Removing wiki/src/news/version_1.2.fr.po
Removing wiki/src/news/version_1.2.fa.po
Removing wiki/src/news/version_1.2.de.po
Removing wiki/src/news/version_1.2.3.pt.po
Removing wiki/src/news/version_1.2.3.it.po
Removing wiki/src/news/version_1.2.3.fr.po
Removing wiki/src/news/version_1.2.3.fa.po
CONFLICT (modify/delete): wiki/src/news/version_1.2.3.de.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/version_1.2.3.de.po left in tree.
Removing wiki/src/news/version_1.2.2.pt.po
Removing wiki/src/news/version_1.2.2.it.po
Removing wiki/src/news/version_1.2.2.fr.po
Removing wiki/src/news/version_1.2.2.fa.po
CONFLICT (modify/delete): wiki/src/news/version_1.2.2.de.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/version_1.2.2.de.po left in tree.
Removing wiki/src/news/version_1.2.1.pt.po
Removing wiki/src/news/version_1.2.1.it.po
Removing wiki/src/news/version_1.2.1.fr.po
Removing wiki/src/news/version_1.2.1.fa.po
CONFLICT (modify/delete): wiki/src/news/version_1.2.1.de.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/version_1.2.1.de.po left in tree.
Removing wiki/src/news/version_1.1.pt.po
Removing wiki/src/news/version_1.1.it.po
Removing wiki/src/news/version_1.1.fr.po
Removing wiki/src/news/version_1.1.fa.po
Removing wiki/src/news/version_1.1.de.po
Removing wiki/src/news/version_1.1.2.pt.po
Removing wiki/src/news/version_1.1.2.it.po
Removing wiki/src/news/version_1.1.2.fr.po
Removing wiki/src/news/version_1.1.2.fa.po
CONFLICT (modify/delete): wiki/src/news/version_1.1.2.de.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/version_1.1.2.de.po left in tree.
Removing wiki/src/news/version_1.1.1.pt.po
Removing wiki/src/news/version_1.1.1.it.po
Removing wiki/src/news/version_1.1.1.fr.po
Removing wiki/src/news/version_1.1.1.fa.po
CONFLICT (modify/delete): wiki/src/news/version_1.1.1.de.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/version_1.1.1.de.po left in tree.
Removing wiki/src/news/version_1.0.pt.po
Removing wiki/src/news/version_1.0.it.po
Removing wiki/src/news/version_1.0.fr.po
Removing wiki/src/news/version_1.0.fa.po
CONFLICT (modify/delete): wiki/src/news/version_1.0.de.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/version_1.0.de.po left in tree.
Removing wiki/src/news/version_1.0.1.pt.po
Removing wiki/src/news/version_1.0.1.it.po
Removing wiki/src/news/version_1.0.1.fr.po
Removing wiki/src/news/version_1.0.1.fa.po
CONFLICT (modify/delete): wiki/src/news/version_1.0.1.de.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/version_1.0.1.de.po left in tree.
Removing wiki/src/news/test_3.0-beta4.pt.po
Removing wiki/src/news/test_3.0-beta4.it.po
Removing wiki/src/news/test_3.0-beta4.fr.po
Removing wiki/src/news/test_3.0-beta4.fa.po
Removing wiki/src/news/test_3.0-beta4.de.po
Removing wiki/src/news/test_3.0-beta3.pt.po
Removing wiki/src/news/test_3.0-beta3.it.po
Removing wiki/src/news/test_3.0-beta3.fr.po
Removing wiki/src/news/test_3.0-beta3.fa.po
Removing wiki/src/news/test_3.0-beta3.de.po
Removing wiki/src/news/test_3.0-beta2.pt.po
Removing wiki/src/news/test_3.0-beta2.it.po
Removing wiki/src/news/test_3.0-beta2.fr.po
Removing wiki/src/news/test_3.0-beta2.fa.po
Removing wiki/src/news/test_3.0-beta2.de.po
Removing wiki/src/news/test_3.0-beta1.pt.po
Removing wiki/src/news/test_3.0-beta1.it.po
Removing wiki/src/news/test_3.0-beta1.fr.po
Removing wiki/src/news/test_3.0-beta1.fa.po
CONFLICT (modify/delete): wiki/src/news/test_3.0-beta1.de.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/test_3.0-beta1.de.po left in tree.
Removing wiki/src/news/test_3.0-alpha1.pt.po
Removing wiki/src/news/test_3.0-alpha1.it.po
Removing wiki/src/news/test_3.0-alpha1.fr.po
Removing wiki/src/news/test_3.0-alpha1.fa.po
CONFLICT (modify/delete): wiki/src/news/test_3.0-alpha1.de.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/test_3.0-alpha1.de.po left in tree.
Removing wiki/src/news/test_2.0-beta1.pt.po
Removing wiki/src/news/test_2.0-beta1.it.po
Removing wiki/src/news/test_2.0-beta1.fr.po
Removing wiki/src/news/test_2.0-beta1.fa.po
CONFLICT (modify/delete): wiki/src/news/test_2.0-beta1.de.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/test_2.0-beta1.de.po left in tree.
CONFLICT (modify/delete): wiki/src/news/test_1.1-beta1.pt.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/test_1.1-beta1.pt.po left in tree.
CONFLICT (modify/delete): wiki/src/news/test_1.1-beta1.it.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/test_1.1-beta1.it.po left in tree.
CONFLICT (modify/delete): wiki/src/news/test_1.1-beta1.fr.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/test_1.1-beta1.fr.po left in tree.
CONFLICT (modify/delete): wiki/src/news/test_1.1-beta1.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/test_1.1-beta1.fa.po left in tree.
CONFLICT (modify/delete): wiki/src/news/test_1.1-beta1.de.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/test_1.1-beta1.de.po left in tree.
Removing wiki/src/blueprint/persistent_Tor_state/discussion.htm
Removing wiki/src/blueprint/macchanger/discussion.htm
Removing wiki/src/blueprint/l10n_Italian/discussion.htm
Auto-merging ikiwiki.setup
Automatic merge failed; fix conflicts and then commit the result. (1)

8 years ago

Changes pushed 8 years ago

Changes pushed 8 years ago

Changes pushed 8 years ago

Repository merged 8 years ago

Changes pushed 8 years ago

Changes pushed 8 years ago

Repository merged 8 years ago

Changes pushed 8 years ago

Changes pushed 8 years ago

Changes pushed 8 years ago

Repository merged 8 years ago

Changes pushed 8 years ago

Changes pushed 8 years ago

Changes pushed 8 years ago

Repository merged 8 years ago

Changes pushed 8 years ago

Changes pushed 8 years ago

The "wiki/src/doc/sensitive_documents/sound_and_video.fr.po" file was changed. 8 years ago

The "wiki/src/doc/persistent_storage/delete.pt.po" file was changed. 8 years ago