emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Changes pushed

Changes pushed 7 years ago
emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Repository merge failed

Auto-merging wiki/src/upgrade.it.po
CONFLICT (content): Merge conflict in wiki/src/upgrade.it.po
Auto-merging wiki/src/press.it.po
CONFLICT (content): Merge conflict in wiki/src/press.it.po
Auto-merging wiki/src/install/win/usb.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb.it.po
Auto-merging wiki/src/install/win.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win.it.po
Auto-merging wiki/src/install/mac/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.it.po
Auto-merging wiki/src/install/linux/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.it.po
Auto-merging wiki/src/install/expert/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.it.po
Auto-merging wiki/src/doc/anonymous_internet/tor_status.it.po
Auto-merging wiki/src/doc/anonymous_internet.index.it.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet.index.it.po
Automatic merge failed; fix conflicts and then commit the result. (1)
7 years ago
emmapeel

Repository merge failed

Auto-merging wiki/src/upgrade.it.po
CONFLICT (content): Merge conflict in wiki/src/upgrade.it.po
Auto-merging wiki/src/press.it.po
CONFLICT (content): Merge conflict in wiki/src/press.it.po
Auto-merging wiki/src/install/win/usb.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb.it.po
Auto-merging wiki/src/install/win.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win.it.po
Auto-merging wiki/src/install/mac/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.it.po
Auto-merging wiki/src/install/linux/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.it.po
Auto-merging wiki/src/install/expert/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.it.po
Auto-merging wiki/src/doc/anonymous_internet/tor_status.it.po
Auto-merging wiki/src/doc/anonymous_internet.index.it.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet.index.it.po
Automatic merge failed; fix conflicts and then commit the result. (1)
7 years ago
emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Repository merge failed

Auto-merging wiki/src/upgrade.it.po
CONFLICT (content): Merge conflict in wiki/src/upgrade.it.po
Auto-merging wiki/src/press.it.po
CONFLICT (content): Merge conflict in wiki/src/press.it.po
Auto-merging wiki/src/install/win/usb.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb.it.po
Auto-merging wiki/src/install/win.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win.it.po
Auto-merging wiki/src/install/mac/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.it.po
Auto-merging wiki/src/install/linux/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.it.po
Auto-merging wiki/src/install/expert/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.it.po
Auto-merging wiki/src/doc/anonymous_internet/tor_status.it.po
Auto-merging wiki/src/doc/anonymous_internet.index.it.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet.index.it.po
Automatic merge failed; fix conflicts and then commit the result. (1)
7 years ago
emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Translation uploaded

7 years ago
emmapeel

Repository merge failed

Auto-merging wiki/src/upgrade.it.po
CONFLICT (content): Merge conflict in wiki/src/upgrade.it.po
Auto-merging wiki/src/press.it.po
CONFLICT (content): Merge conflict in wiki/src/press.it.po
Auto-merging wiki/src/install/win/usb.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb.it.po
Auto-merging wiki/src/install/win.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win.it.po
Auto-merging wiki/src/install/mac/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.it.po
Auto-merging wiki/src/install/linux/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.it.po
Auto-merging wiki/src/install/expert/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.it.po
Auto-merging wiki/src/doc/anonymous_internet/tor_status.it.po
Auto-merging wiki/src/doc/anonymous_internet.index.it.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet.index.it.po
Automatic merge failed; fix conflicts and then commit the result. (1)
7 years ago
emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Repository merge failed

Auto-merging wiki/src/upgrade.it.po
CONFLICT (content): Merge conflict in wiki/src/upgrade.it.po
Auto-merging wiki/src/press.it.po
CONFLICT (content): Merge conflict in wiki/src/press.it.po
Auto-merging wiki/src/install/win/usb.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb.it.po
Auto-merging wiki/src/install/win.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win.it.po
Auto-merging wiki/src/install/mac/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.it.po
Auto-merging wiki/src/install/linux/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.it.po
Auto-merging wiki/src/install/expert/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.it.po
Auto-merging wiki/src/doc/anonymous_internet/tor_status.it.po
Auto-merging wiki/src/doc/anonymous_internet.index.it.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet.index.it.po
Automatic merge failed; fix conflicts and then commit the result. (1)
7 years ago
emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Repository merge failed

Auto-merging wiki/src/upgrade.it.po
CONFLICT (content): Merge conflict in wiki/src/upgrade.it.po
Auto-merging wiki/src/press.it.po
CONFLICT (content): Merge conflict in wiki/src/press.it.po
Auto-merging wiki/src/install/win/usb.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb.it.po
Auto-merging wiki/src/install/win.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win.it.po
Auto-merging wiki/src/install/mac/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.it.po
Auto-merging wiki/src/install/linux/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.it.po
Auto-merging wiki/src/install/expert/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.it.po
Auto-merging wiki/src/doc/anonymous_internet/tor_status.it.po
Auto-merging wiki/src/doc/anonymous_internet.index.it.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet.index.it.po
Automatic merge failed; fix conflicts and then commit the result. (1)
7 years ago
emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Changes committed

Changes committed 7 years ago
emmapeel

Changes committed

Changes committed 7 years ago

Search