emmapeel

Resource updated

The “wiki/src/nav/main.es.po” file was changed. 06/27/2018
emmapeel

Resource updated

The “wiki/src/nav/main.fa.po” file was changed. 06/27/2018
emmapeel

Resource updated

The “wiki/src/install/inc/steps/download.inline.pt.po” file was changed. 06/27/2018
emmapeel

Resource updated

The “wiki/src/install/inc/steps/download.inline.it.po” file was changed. 06/27/2018
emmapeel

Resource updated

The “wiki/src/install/inc/steps/download.inline.fr.po” file was changed. 06/27/2018
emmapeel

Resource updated

The “wiki/src/install/inc/steps/download.inline.fa.po” file was changed. 06/27/2018
emmapeel

Resource updated

The “wiki/src/install/inc/steps/download.inline.es.po” file was changed. 06/27/2018
emmapeel

Resource updated

The “wiki/src/install/inc/steps/download.inline.de.po” file was changed. 06/27/2018
emmapeel

Resource updated

The “wiki/src/doc/anonymous_internet/electrum.pt.po” file was changed. 06/27/2018
emmapeel

Resource updated

The “wiki/src/doc/anonymous_internet/electrum.fr.po” file was changed. 06/27/2018
emmapeel

Resource updated

The “wiki/src/doc/anonymous_internet/electrum.it.po” file was changed. 06/27/2018
emmapeel

Resource updated

The “wiki/src/doc/anonymous_internet/electrum.es.po” file was changed. 06/27/2018
emmapeel

Resource updated

The “wiki/src/doc/anonymous_internet/electrum.fa.po” file was changed. 06/27/2018
emmapeel

Resource updated

The “wiki/src/doc/anonymous_internet/electrum.de.po” file was changed. 06/27/2018
emmapeel

Repository merge failed

Auto-merging wiki/src/upgrade/v1/Tails/3.8.1/amd64/stable/upgrades.yml
Auto-merging wiki/src/upgrade/v1/Tails/3.8.1/amd64/alpha/upgrades.yml
Removing wiki/src/upgrade/v1/Tails/3.7.2/amd64/stable/upgrades.yml.pgp
Removing wiki/src/upgrade/v1/Tails/3.7.2/amd64/alpha/upgrades.yml.pgp
Auto-merging wiki/src/upgrade/tails.it.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/tails.it.po
Auto-merging wiki/src/upgrade/tails.fr.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/tails.fr.po
Auto-merging wiki/src/upgrade/tails.fa.po
Auto-merging wiki/src/upgrade/tails.de.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/tails.de.po
Auto-merging wiki/src/torrents/files/tails-amd64-3.8.packages
Auto-merging wiki/src/torrents/files/tails-amd64-3.8.build-manifest
Removing wiki/src/torrents/files/tails-amd64-3.7.1.torrent
Removing wiki/src/torrents/files/tails-amd64-3.7.1.iso.sig
Removing wiki/src/misc/unsafe_browser_warning.pt.html
Removing wiki/src/misc/unsafe_browser_warning.it.html
Auto-merging wiki/src/misc/unsafe_browser_warning.html
Removing wiki/src/misc/unsafe_browser_warning.fr.html
Removing wiki/src/misc/unsafe_browser_warning.fa.html
Removing wiki/src/misc/unsafe_browser_warning.de.html
Auto-merging wiki/src/install/inc/steps/download.inline.it.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.it.po
Auto-merging wiki/src/install/inc/steps/download.inline.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.fa.po
Auto-merging wiki/src/doc/anonymous_internet/electrum.it.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/electrum.it.po
Auto-merging wiki/src/doc/anonymous_internet/electrum.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/electrum.de.po
Auto-merging ikiwiki.setup
Auto-merging ikiwiki-cgi.setup
Auto-merging config/chroot_local-includes/etc/thunderbird/profile/chrome/userChrome.css
Automatic merge failed; fix conflicts and then commit the result. (1)
06/27/2018
emmapeel

Changes pushed

Changes pushed 06/25/2018
emmapeel

Repository merged

Repository merged

Original revision: N/A
New revision: N/A 06/25/2018
emmapeel

Changes pushed

Changes pushed 06/22/2018
emmapeel

Suggestion added

 
06/21/2018
emmapeel

Suggestion added

 
06/21/2018

Search