|
ignifugo
Repository merge failed |
12/13/2018
|
|
ignifugo
Repository merge failed |
warning: Failed to merge submodule submodules/aufs4-standalone (not checked out) (1)12/13/2018 |
|
ignifugo
Repository merge failed |
warning: Failed to merge submodule submodules/aufs4-standalone (not checked out) (1)12/13/2018 |
|
ignifugo
Repository merge failed |
warning: Failed to merge submodule submodules/aufs4-standalone (not checked out) (1)12/13/2018 |
|
blackflag
Repository merge failed |
Auto-merging wiki/src/doc/encryption_and_privacy/veracrypt.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/veracrypt.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/luks_vs_veracrypt.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/luks_vs_veracrypt.inline.fr.po Automatic merge failed; fix conflicts and then commit the result. (1)12/10/2018 |
|
blackflag
Repository merge failed |
Auto-merging wiki/src/doc/encryption_and_privacy/veracrypt.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/veracrypt.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/luks_vs_veracrypt.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/luks_vs_veracrypt.inline.fr.po Automatic merge failed; fix conflicts and then commit the result. (1)12/10/2018 |
|
blackflag
Repository merge failed |
Auto-merging wiki/src/doc/encryption_and_privacy/veracrypt.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/veracrypt.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/luks_vs_veracrypt.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/luks_vs_veracrypt.inline.fr.po Automatic merge failed; fix conflicts and then commit the result. (1)12/10/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/doc/encryption_and_privacy/veracrypt.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/veracrypt.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/luks_vs_veracrypt.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/luks_vs_veracrypt.inline.fr.po Automatic merge failed; fix conflicts and then commit the result. (1)12/09/2018 |
|
emmapeel
Changes pushed |
Changes pushed
12/05/2018
|
|
emmapeel
Changes pushed |
Changes pushed
12/05/2018
|
|
emmapeel
Repository merge failed |
Removing wiki/src/install/v1/Tails/i386/stable/latest.yml Auto-merging wiki/src/doc/anonymous_internet/pidgin.it.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.it.po Auto-merging wiki/src/contribute.it.po CONFLICT (content): Merge conflict in wiki/src/contribute.it.po Automatic merge failed; fix conflicts and then commit the result. (1)12/04/2018 |
|
emmapeel
Changes pushed |
Changes pushed
12/03/2018
|
|
emmapeel
Changes pushed |
Changes pushed
12/03/2018
|
|
emmapeel
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 12/03/2018 |
|
emmapeel
Changes pushed |
Changes pushed
12/02/2018
|
|
emmapeel
Changes pushed |
Changes pushed
12/02/2018
|
|
emmapeel
Changes pushed |
Changes pushed
12/02/2018
|
|
emmapeel
Changes pushed |
Changes pushed
12/02/2018
|
|
emmapeel
Changes pushed |
Changes pushed
12/02/2018
|
|
emmapeel
Changes pushed |
Changes pushed
12/02/2018
|