summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Ship default upstream Tor Browser bookmarks instead of an empty set (refs: #1...feature/15895-remove-custom-bookmarks+force-all-testsintrigeri2019-07-053-63/+2
* Design doc: fix broken link.intrigeri2019-07-051-1/+1
* Remove our predefined bookmarks (#15895)sajolida2019-07-051-25/+0
* Update POT and PO files.intrigeri2019-06-3050-150/+877
* Merge remote-tracking branch 'origin/master' into stableintrigeri2019-06-302452-8474/+402446
|\
| * merge with main git using update-weblate-git.Tails translators2019-06-30200-8802/+38
| |\
| | * wiki/src/install/**/*.po: remove obsolete (#~) strings.intrigeri2019-06-30192-8775/+11
| |/
| * merge with main git using update-weblate-git.Tails translators2019-06-303-11/+18
| |\
| | * Revert spam.intrigeri2019-06-303-11/+18
| |/
| * merge with main git using update-weblate-git.Tails translators2019-06-301-5/+0
| |\
| | * This reverts commit 047bc53ff09df49e3375b69d542ab9185c4d57a9127.0.0.12019-06-301-5/+0
| |/
| * merge with main git using update-weblate-git.Tails translators2019-06-302-13/+11
| |\
| | * This reverts commit 34eb600e1c44d28a91619d334eac4c609de1f8cc127.0.0.12019-06-301-0/+5
| | * This reverts commit 3a032f19103ba63ebf117d3c0fee9a0c37f4166e127.0.0.12019-06-302-13/+11
| | * Merge branch 'master' of puppet-git.lizard:tailsIkiWiki2019-06-290-0/+0
| | |\ | | |/ | |/|
| * | merge with main git using update-weblate-git.Tails translators2019-06-292-11/+13
| |\ \
| | | * Merge branch 'master' of puppet-git.lizard:tailsIkiWiki2019-06-292-11/+13
| | | |\ | | | |/ | | |/|
| | * | Revert spam.intrigeri2019-06-292-11/+13
| |/ /
| | * Merge branch 'master' of puppet-git.lizard:tailsIkiWiki2019-06-280-0/+0
| | |\ | | |/ | |/|
| * | merge with main git using update-weblate-git.Tails translators2019-06-282-13/+11
| |\ \
| | | * This reverts commit 047bc53ff09df49e3375b69d542ab9185c4d57a9127.0.0.12019-06-281-5/+0
| | |/
| | * This reverts commit b77108db23ae13725552bf73ad7b00fda76b110a127.0.0.12019-06-281-2/+0
| | * This reverts commit 64e2eee846482bcc7e29e991e935f12e5868a3a1127.0.0.12019-06-281-1/+5
| | * This reverts commit c71decb4d66540df6ef769aebbcb230acfc661c5127.0.0.12019-06-281-10/+6
| |/
| * merge with main git using update-weblate-git.Tails translators2019-06-281-8/+15
| |\
| | * Update translator's documentation to mention the pre-commit hookUlrike Uhlig2019-06-281-8/+15
| | * Merge branch 'master' of d53ykjpeekuikgoq.onion:tailsUlrike Uhlig2019-06-282483-2285/+408102
| | |\ | | |/ | |/|
| * | merge with main git using update-weblate-git.Tails translators2019-06-281-1/+1
| |\ \
| | * | pre-commit-translation: fix path of (renamed and moved) script.intrigeri2019-06-281-1/+1
| |/ /
| * | Translated using Weblate (German)intrigeri2019-06-271-2/+2
| * | Translated using Weblate (German)Hefee2019-06-271-4/+7
| * | merge with main git using update-weblate-git.Tails translators2019-06-2716-46/+46
| |\ \
| | * | updated PO filesIkiWiki2019-06-276-18/+18
| | * | Merge remote-tracking branch 'remotes/origin/master'intrigeri2019-06-279-35/+37
| | |\ \ | | |/ / | |/| |
| * | | merge with main git using update_weblate_git.py.Tails translators2019-06-2716-56/+78
| |\ \ \
| | | * | Revert "Improve phrasing."intrigeri2019-06-271-1/+1
| | |/ /
| | * | updated PO filesIkiWiki2019-06-276-18/+18
| | * | Improve phrasing.intrigeri2019-06-271-1/+1
| | * | updated PO filesIkiWiki2019-06-276-18/+18
| | * | Revert "Improve phrasing."intrigeri2019-06-271-1/+1
| | * | updated PO filesIkiWiki2019-06-276-20/+40
| | * | Improve phrasing.intrigeri2019-06-271-1/+1
| |/ /
| * | Dummy commit.intrigeri2019-06-271-1/+1
| * | Fix typo.intrigeri2019-06-271-1/+1
| * | merge with main git using update-weblate-git.Tails translators2019-06-260-0/+0
| |\ \
| * \ \ merge with main git using update-weblate-git.Tails translators2019-06-260-0/+0
| |\ \ \ | | |/ /
| * | | merge with main git using update-weblate-git.Tails translators2019-06-260-0/+0
| |\ \ \ | | |/ /
| * | | merge with main git using update-weblate-git.Tails translators2019-06-260-0/+0
| |\ \ \ | | |/ /
| * | | merge with main git using update-weblate-git.Tails translators2019-06-261-3/+3
| |\ \ \ | | |/ /
| | * | Improve phrasing.intrigeri2019-06-261-1/+1