|
emmapeel
Changes pushed |
Changes pushed
03/11/2018
|
|
emmapeel
Changes pushed |
Changes pushed
03/11/2018
|
|
emmapeel
Changes pushed |
Changes pushed
03/11/2018
|
|
emmapeel
Changes pushed |
Changes pushed
03/11/2018
|
|
emmapeel
Changes pushed |
Changes pushed
03/10/2018
|
|
admin
Changes pushed |
Changes pushed
03/09/2018
|
|
admin
Repository merge failed |
Auto-merging wiki/src/support/known_issues.pt.po CONFLICT (content): Merge conflict in wiki/src/support/known_issues.pt.po Auto-merging wiki/src/support/known_issues.it.po Auto-merging wiki/src/support/known_issues.fa.po CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fa.po Auto-merging wiki/src/support/known_issues.es.po Auto-merging wiki/src/support/known_issues.de.po Auto-merging wiki/src/support/faq.pt.po Auto-merging wiki/src/support/faq.it.po Auto-merging wiki/src/support/faq.fa.po Auto-merging wiki/src/support/faq.es.po Auto-merging wiki/src/support/faq.de.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.pt.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.it.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.fa.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.es.po Automatic merge failed; fix conflicts and then commit the result. (1)03/09/2018 |
|
admin
Repository merge failed |
Auto-merging wiki/src/support/known_issues.pt.po CONFLICT (content): Merge conflict in wiki/src/support/known_issues.pt.po Auto-merging wiki/src/support/known_issues.it.po Auto-merging wiki/src/support/known_issues.fa.po CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fa.po Auto-merging wiki/src/support/known_issues.es.po Auto-merging wiki/src/support/known_issues.de.po Auto-merging wiki/src/support/faq.pt.po Auto-merging wiki/src/support/faq.it.po Auto-merging wiki/src/support/faq.fa.po Auto-merging wiki/src/support/faq.es.po Auto-merging wiki/src/support/faq.de.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.pt.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.it.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.fa.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.es.po Automatic merge failed; fix conflicts and then commit the result. (1)03/09/2018 |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/support/known_issues.pt.po Auto-merging wiki/src/support/known_issues.it.po Auto-merging wiki/src/support/known_issues.fa.po Auto-merging wiki/src/support/known_issues.es.po Auto-merging wiki/src/support/known_issues.de.po Auto-merging wiki/src/install/inc/steps/install_final.inline.pt.po CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/install_final.inline.pt.po Auto-merging wiki/src/install/inc/steps/install_final.inline.it.po Auto-merging wiki/src/install/inc/steps/install_final.inline.fa.po Auto-merging wiki/src/install/inc/steps/install_final.inline.es.po Auto-merging wiki/src/install/inc/steps/install_final.inline.de.po Auto-merging wiki/src/install/inc/steps/download.inline.pt.po Auto-merging wiki/src/install/inc/steps/download.inline.it.po Auto-merging wiki/src/install/inc/steps/download.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.fr.po Auto-merging wiki/src/install/inc/steps/download.inline.fa.po Auto-merging wiki/src/install/inc/steps/download.inline.es.po CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.es.po Auto-merging wiki/src/install/inc/steps/download.inline.de.po Auto-merging wiki/src/doc/sensitive_documents/metadata.pt.po Auto-merging wiki/src/doc/sensitive_documents/metadata.it.po Auto-merging wiki/src/doc/about/fingerprint.it.po Auto-merging wiki/src/doc/about/features.pt.po Auto-merging wiki/src/doc/about/features.it.po Auto-merging wiki/src/doc/about/features.fa.po Auto-merging wiki/src/doc/about/features.es.po Auto-merging po/de.po Auto-merging po/ca.po Removing features/images/TorBrowserPrintOutputFileSelected.png Removing features/images/TorBrowserPrintOutputFile.png Removing features/images/ElectrumWalletSeedTextbox.png Removing features/images/ElectrumWalletGenerationSeed.png Removing features/images/ElectrumStatus.png Removing features/images/ElectrumSeedVerificationPrompt.png Removing features/images/ElectrumPreferencesButton.png Removing features/images/ElectrumNoWallet.png Removing features/images/ElectrumNextButton.png Removing features/images/ElectrumEncryptWallet.png Removing features/images/ElectrumCreateNewSeed.png Removing features/images/BrowserPrintToFile.png Auto-merging config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/lib.js Removing config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/metadata.json Removing config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js Removing config/chroot_local-includes/lib/systemd/system/update-ca-certificates.service Removing config/chroot_local-includes/etc/apparmor.d/disable/usr.bin.thunderbird Removing config/chroot_local-includes/etc/NetworkManager/dispatcher.d/00-save-env Automatic merge failed; fix conflicts and then commit the result. (1)03/07/2018 |
|
emmapeel
Changes pushed |
Changes pushed
03/02/2018
|
|
emmapeel
Changes pushed |
Changes pushed
03/02/2018
|
|
emmapeel
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 03/02/2018 |
|
emmapeel
Changes pushed |
Changes pushed
03/02/2018
|
|
emmapeel
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 03/02/2018 |
|
emmapeel
Changes pushed |
Changes pushed
03/02/2018
|
|
emmapeel
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 03/02/2018 |
|
emmapeel
Changes pushed |
Changes pushed
03/02/2018
|
|
emmapeel
Changes pushed |
Changes pushed
03/02/2018
|
|
emmapeel
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 03/02/2018 |
|
emmapeel
Changes pushed |
Changes pushed
03/01/2018
|