2. Changes

The "wiki/src/doc.fr.po" file was changed. 6 years ago

The "wiki/src/doc.de.po" file was changed. 6 years ago

The "wiki/src/doc.fa.po" file was changed. 6 years ago

The "wiki/src/contribute.pt.po" file was changed. 6 years ago

The "wiki/src/contribute.it.po" file was changed. 6 years ago

The "wiki/src/contribute.fr.po" file was changed. 6 years ago

The "wiki/src/contribute.de.po" file was changed. 6 years ago

The "wiki/src/contribute.fa.po" file was changed. 6 years ago

Repository merged 6 years ago

English Spanish 0 characters edited 7 years ago

Removing wiki/src/templates/inlinepage.tmpl
Removing wiki/src/templates/archivepage.tmpl
Auto-merging wiki/src/security/ineffective_firewall-level_Tor_enforcement.fa.po
CONFLICT (content): Merge conflict in wiki/src/security/ineffective_firewall-level_Tor_enforcement.fa.po
Auto-merging wiki/src/news/windows_camouflage_jessie.fr.po
Auto-merging wiki/src/news/windows_camouflage_jessie.de.po
Auto-merging wiki/src/news/who_are_you_helping.de.po
Auto-merging wiki/src/news/what_we_do_with_your_money.de.po
Auto-merging wiki/src/news/test_redesigned_Tails_Greeter.de.po
Auto-merging wiki/src/news/test_incremental_upgrades.fr.po
Auto-merging wiki/src/news/test_UEFI.fr.po
Auto-merging wiki/src/news/test_UEFI.de.po
Auto-merging wiki/src/news/tails-testers.fr.po
Auto-merging wiki/src/news/tails-testers.de.po
Auto-merging wiki/src/news/tails-support.fa.po
Auto-merging wiki/src/news/signing_key_transition.de.po
Auto-merging wiki/src/news/our_plans_for_2017.de.po
Auto-merging wiki/src/news/new_project_name.fr.po
Auto-merging wiki/src/news/new_project_name.de.po
Auto-merging wiki/src/news/new_SSL_certificate.fr.po
Auto-merging wiki/src/news/new_SSL_certificate.de.po
Auto-merging wiki/src/news/logo_contest.fr.po
Auto-merging wiki/src/news/logo_contest.de.po
Auto-merging wiki/src/news/fpf_campaign.fr.po
Auto-merging wiki/src/news/fpf_campaign.de.po
Auto-merging wiki/src/news/bounties_2013_report.fr.po
Auto-merging wiki/src/news/and_the_winner_is.fr.po
Auto-merging wiki/src/news/and_the_winner_is.de.po
Auto-merging wiki/src/news/amnesia_may_now_work_on_the_Mac.de.po
Auto-merging wiki/src/news/Tails_HackFest_2014.fr.po
Auto-merging wiki/src/news/Tails_HackFest_2014.de.po
Auto-merging wiki/src/news/Tails_3.0_will_require_a_64-bit_processor.de.po
Auto-merging wiki/src/news/Mac_and_PC_UEFI_hardware_needed.fr.po
Auto-merging wiki/src/news/Mac_and_PC_UEFI_hardware_needed.de.po
Auto-merging wiki/src/news/Join_us_at_the_Tails_HackFest_2014.de.po
Auto-merging wiki/src/news/IP_leakage_with_Icedove.de.po
Auto-merging wiki/src/news/33c3.de.po
Auto-merging wiki/src/doc/about/openpgp_keys.fr.po
Removing wiki/src/contribute/working_together/roles/sysadmins/automated_builds_in_jenkins.mdwn
Removing wiki/src/contribute/release_process/test/usage/on_lizard.mdwn
Removing wiki/src/blueprint/monthly_report/report_2017_10.mdwn
Removing wiki/src/blueprint/easy_encrypted_bug_reporting/discussion.mdwn
Removing wiki/src/blueprint/bootstrapping/extension/discussion.htm
Removing wiki/src/blueprint/Port_shell_scripts_to_Python/discussion.htm
Removing wiki/src/blueprint/Linux_containers/discussion.htm
Auto-merging ikiwiki.setup
Automatic merge failed; fix conflicts and then commit the result. (1)

7 years ago

Removing wiki/src/templates/inlinepage.tmpl
Removing wiki/src/templates/archivepage.tmpl
Auto-merging wiki/src/security/ineffective_firewall-level_Tor_enforcement.fa.po
CONFLICT (content): Merge conflict in wiki/src/security/ineffective_firewall-level_Tor_enforcement.fa.po
Auto-merging wiki/src/news/windows_camouflage_jessie.fr.po
Auto-merging wiki/src/news/windows_camouflage_jessie.de.po
Auto-merging wiki/src/news/who_are_you_helping.de.po
Auto-merging wiki/src/news/what_we_do_with_your_money.de.po
Auto-merging wiki/src/news/test_redesigned_Tails_Greeter.de.po
Auto-merging wiki/src/news/test_incremental_upgrades.fr.po
Auto-merging wiki/src/news/test_UEFI.fr.po
Auto-merging wiki/src/news/test_UEFI.de.po
Auto-merging wiki/src/news/tails-testers.fr.po
Auto-merging wiki/src/news/tails-testers.de.po
Auto-merging wiki/src/news/tails-support.fa.po
Auto-merging wiki/src/news/signing_key_transition.de.po
Auto-merging wiki/src/news/our_plans_for_2017.de.po
Auto-merging wiki/src/news/new_project_name.fr.po
Auto-merging wiki/src/news/new_project_name.de.po
Auto-merging wiki/src/news/new_SSL_certificate.fr.po
Auto-merging wiki/src/news/new_SSL_certificate.de.po
Auto-merging wiki/src/news/logo_contest.fr.po
Auto-merging wiki/src/news/logo_contest.de.po
Auto-merging wiki/src/news/fpf_campaign.fr.po
Auto-merging wiki/src/news/fpf_campaign.de.po
Auto-merging wiki/src/news/bounties_2013_report.fr.po
Auto-merging wiki/src/news/and_the_winner_is.fr.po
Auto-merging wiki/src/news/and_the_winner_is.de.po
Auto-merging wiki/src/news/amnesia_may_now_work_on_the_Mac.de.po
Auto-merging wiki/src/news/Tails_HackFest_2014.fr.po
Auto-merging wiki/src/news/Tails_HackFest_2014.de.po
Auto-merging wiki/src/news/Tails_3.0_will_require_a_64-bit_processor.de.po
Auto-merging wiki/src/news/Mac_and_PC_UEFI_hardware_needed.fr.po
Auto-merging wiki/src/news/Mac_and_PC_UEFI_hardware_needed.de.po
Auto-merging wiki/src/news/Join_us_at_the_Tails_HackFest_2014.de.po
Auto-merging wiki/src/news/IP_leakage_with_Icedove.de.po
Auto-merging wiki/src/news/33c3.de.po
Auto-merging wiki/src/doc/about/openpgp_keys.fr.po
Removing wiki/src/contribute/working_together/roles/sysadmins/automated_builds_in_jenkins.mdwn
Removing wiki/src/contribute/release_process/test/usage/on_lizard.mdwn
Removing wiki/src/blueprint/easy_encrypted_bug_reporting/discussion.mdwn
Removing wiki/src/blueprint/bootstrapping/extension/discussion.htm
Removing wiki/src/blueprint/Port_shell_scripts_to_Python/discussion.htm
Removing wiki/src/blueprint/Linux_containers/discussion.htm
Auto-merging ikiwiki.setup
Automatic merge failed; fix conflicts and then commit the result. (1)

7 years ago

Removing wiki/src/templates/inlinepage.tmpl
Removing wiki/src/templates/archivepage.tmpl
Auto-merging wiki/src/security/ineffective_firewall-level_Tor_enforcement.fa.po
CONFLICT (content): Merge conflict in wiki/src/security/ineffective_firewall-level_Tor_enforcement.fa.po
Auto-merging wiki/src/news/windows_camouflage_jessie.fr.po
Auto-merging wiki/src/news/windows_camouflage_jessie.de.po
Auto-merging wiki/src/news/who_are_you_helping.de.po
Auto-merging wiki/src/news/what_we_do_with_your_money.de.po
Auto-merging wiki/src/news/test_redesigned_Tails_Greeter.de.po
Auto-merging wiki/src/news/test_incremental_upgrades.fr.po
Auto-merging wiki/src/news/test_UEFI.fr.po
Auto-merging wiki/src/news/test_UEFI.de.po
Auto-merging wiki/src/news/tails-testers.fr.po
Auto-merging wiki/src/news/tails-testers.de.po
Auto-merging wiki/src/news/tails-support.fa.po
Auto-merging wiki/src/news/signing_key_transition.de.po
Auto-merging wiki/src/news/our_plans_for_2017.de.po
Auto-merging wiki/src/news/new_project_name.fr.po
Auto-merging wiki/src/news/new_project_name.de.po
Auto-merging wiki/src/news/new_SSL_certificate.fr.po
Auto-merging wiki/src/news/new_SSL_certificate.de.po
Auto-merging wiki/src/news/logo_contest.fr.po
Auto-merging wiki/src/news/logo_contest.de.po
Auto-merging wiki/src/news/fpf_campaign.fr.po
Auto-merging wiki/src/news/fpf_campaign.de.po
Auto-merging wiki/src/news/bounties_2013_report.fr.po
Auto-merging wiki/src/news/and_the_winner_is.fr.po
Auto-merging wiki/src/news/and_the_winner_is.de.po
Auto-merging wiki/src/news/amnesia_may_now_work_on_the_Mac.de.po
Auto-merging wiki/src/news/Tails_HackFest_2014.fr.po
Auto-merging wiki/src/news/Tails_HackFest_2014.de.po
Auto-merging wiki/src/news/Tails_3.0_will_require_a_64-bit_processor.de.po
Auto-merging wiki/src/news/Mac_and_PC_UEFI_hardware_needed.fr.po
Auto-merging wiki/src/news/Mac_and_PC_UEFI_hardware_needed.de.po
Auto-merging wiki/src/news/Join_us_at_the_Tails_HackFest_2014.de.po
Auto-merging wiki/src/news/IP_leakage_with_Icedove.de.po
Auto-merging wiki/src/news/33c3.de.po
Removing wiki/src/contribute/working_together/roles/sysadmins/automated_builds_in_jenkins.mdwn
Removing wiki/src/contribute/release_process/test/usage/on_lizard.mdwn
Removing wiki/src/blueprint/Port_shell_scripts_to_Python/discussion.htm
Automatic merge failed; fix conflicts and then commit the result. (1)

7 years ago

Auto-merging wiki/src/doc/first_steps/reset/linux.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/reset/linux.fr.po
Auto-merging wiki/src/doc/first_steps/bug_reporting.fa.po
Removing wiki/src/blueprint/Port_shell_scripts_to_Python/discussion.htm
Automatic merge failed; fix conflicts and then commit the result. (1)

7 years ago

Changes pushed 7 years ago

Changes pushed 7 years ago

Changes pushed 7 years ago

The "wiki/src/doc/upgrade/error/install.fr.po" file was changed. 7 years ago

The "wiki/src/doc/first_steps/shutdown.fr.po" file was changed. 7 years ago

The "wiki/src/doc/reset.intro.fr.po" file was changed. 7 years ago