emmapeel

Repository merge failed

  1. Tails
  2. wiki/src/index.*.po
 
Auto-merging wiki/src/press.fr.po
CONFLICT (content): Merge conflict in wiki/src/press.fr.po
Auto-merging wiki/src/doc/first_steps/persistence/upgrade.fa.po
Auto-merging wiki/src/doc/first_steps/persistence/recover_insecure.fa.po
Auto-merging wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fa.po
Automatic merge failed; fix conflicts and then commit the result. (1)
9 years ago
None

Changes committed

  1. Tails
  2. wiki/src/doc/upgrade/error/install.*.po
  3. Spanish
Changes committed 9 years ago
None

Changes committed

  1. Tails
  2. wiki/src/support/known_issues.*.po
  3. Spanish
Changes committed 9 years ago
None

Changes committed

  1. Tails
  2. wiki/src/support/faq.*.po
  3. Spanish
Changes committed 9 years ago
None

Changes committed

  1. Tails
  2. wiki/src/install/inc/steps/restart_second_time.inline.*.po
  3. Persian
Changes committed 9 years ago
None

Changes committed

  1. Tails
  2. wiki/src/install/inc/steps/restart_first_time.inline.*.po
  3. Persian
Changes committed 9 years ago
None

Changes committed

  1. Tails
  2. wiki/src/news/tails-support.*.po
  3. Persian
Changes committed 9 years ago
None

Changes committed

  1. Tails
  2. wiki/src/security/ineffective_firewall-level_Tor_enforcement.*.po
  3. Persian
Changes committed 9 years ago
None

Changes committed

  1. Tails
  2. wiki/src/doc/advanced_topics/lan.*.po
  3. Persian
Changes committed 9 years ago
None

Changes committed

  1. Tails
  2. wiki/src/doc/first_steps/welcome_screen/mac_spoofing.*.po
  3. Persian
Changes committed 9 years ago
None

Changes committed

  1. Tails
  2. wiki/src/doc/first_steps/reset/mac.*.po
  3. Persian
Changes committed 9 years ago
None

Changes committed

  1. Tails
  2. wiki/src/doc/persistent_storage/configure.*.po
  3. Persian
Changes committed 9 years ago
None

Changes committed

  1. Tails
  2. wiki/src/doc/encryption_and_privacy/encrypted_volumes.*.po
  3. Persian
Changes committed 9 years ago
None

Changes committed

  1. Tails
  2. wiki/src/doc/about.*.po
  3. Persian
Changes committed 9 years ago
None

Changes committed

  1. Tails
  2. wiki/src/doc/advanced_topics/wireless_devices.*.po
  3. Persian
Changes committed 9 years ago
None

Changes committed

  1. Tails
  2. wiki/src/doc/anonymous_internet/Tor_Browser.*.po
  3. Persian
Changes committed 9 years ago
None

Changes committed

  1. Tails
  2. wiki/src/doc/advanced_topics/virtualization/virt-manager.*.po
  3. Persian
Changes committed 9 years ago
None

Changes committed

  1. Tails
  2. wiki/src/doc/about/features.*.po
  3. Spanish
Changes committed 9 years ago
None

Changes committed

  1. Tails
  2. wiki/src/doc/about/features.*.po
  3. Spanish
Changes committed 9 years ago
None

Changes committed

  1. Tails
  2. wiki/src/doc/about/features.*.po
  3. Spanish
Changes committed 9 years ago

Search