summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Mark Tails 3.6.1 as released.3.6.1intrigeri2018-03-161-2/+2
* Changelog++intrigeri2018-03-161-0/+3
* Merge branch 'bugfix/15417-tor-browser-7.5.2' into stable (Fix-committed: #15...intrigeri2018-03-163-18/+17
|\
| * Revert "Tor Browser: enable Selfrando."intrigeri2018-03-161-1/+0
| * Upgrade Tor Browser to 7.5.2-build1.intrigeri2018-03-162-17/+17
* | Update website PO files.intrigeri2018-03-162-12/+12
* | Update changelog for 3.6.1.intrigeri2018-03-161-2/+9
* | Update version and date for 3.6.1.intrigeri2018-03-166-6/+6
* | Merge remote-tracking branch 'origin/master' into stableintrigeri2018-03-164-14/+39
|\ \
| * \ Merge remote-tracking branch 'origin/master'sajolida2018-03-1611-72/+88
| |\ \
| | * \ Merge remote-tracking branch 'origin/master'sajolida2018-03-1626-112/+677
| | |\ \
| | | * | Tor Browser release process: don't include tor-browser-linux64-debug.tar.xz i...intrigeri2018-03-161-2/+3
| | | * | Release process: ensure we merge something that's up-to-date.intrigeri2018-03-161-1/+1
| | * | | Merge remote-tracking branch 'emmapeel/review-pt'sajolida2018-03-161-11/+7
| | |\ \ \
| | | * | | some rewrapping filtered outemma peel2018-03-151-11/+7
| * | | | | Clarify unspecified items of the interface (#15423)sajolida2018-03-161-0/+28
* | | | | | Update PO files.intrigeri2018-03-162-10/+7
* | | | | | Merge branch 'bugfix/15400-python-lib-breaks-reproducibility' into stable (Fi...intrigeri2018-03-161-1/+8
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Fix 00-install-tailslibsegfault2018-03-161-1/+1
| * | | | | Strip dates from Tailslib Python packagesegfault2018-03-161-1/+8
* | | | | | Merge remote-tracking branch 'origin/master' into stableintrigeri2018-03-1639-2080/+1949
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | language headeremma peel2018-03-161-1/+2
| * | | | Merge remote-tracking branch 'origin/master'intrigeri2018-03-1621-90/+653
| |\ \ \ \
| | * | | | updated PO filesamnesia2018-03-167-55/+73
| | |/ / /
| | * | | updates and unfuzzy release translationsemma peel2018-03-166-5/+66
| | * | | updated and unfuzzied upgrade translation filesemma peel2018-03-166-52/+159
| | * | | new inline translation filesemma peel2018-03-166-0/+348
| | * | | Document how to use Tails Installer to do a manual upgrade from 3.5 (#15416)sajolida2018-03-163-0/+29
| * | | | Tor Browser release process: renumber bullet points.intrigeri2018-03-161-1/+1
| * | | | Release process: fix typo.intrigeri2018-03-161-1/+1
| |/ / /
| * | | Release Manager: make some expectations explicit.intrigeri2018-03-162-0/+11
| * | | Calendar: remove past events.intrigeri2018-03-161-11/+0
| * | | Merge remote-tracking branch 'origin/master'intrigeri2018-03-16192-12858/+15245
| |\ \ \ | | |/ /
| | * | Add more rules for when sending merge requests to main list.127.0.0.12018-03-151-6/+8
| | * | updated PO filesamnesia2018-03-156-30/+6
| | * | Remove superfluous titleUlrike Uhlig2018-03-151-2/+0
| | * | Argh, wrong link.Ulrike Uhlig2018-03-151-1/+1
| | * | Merge branch 'master' of webmasters.boum.org:wikiUlrike Uhlig2018-03-156-1591/+1098
| | |\ \
| | | * | updated PO filesamnesia2018-03-156-1591/+1098
| | * | | Merge branch 'wed/donate-through-ddg'Ulrike Uhlig2018-03-151-0/+0
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Add ddg imageUlrike Uhlig2018-03-151-0/+0
| | * | | Merge branch 'wed/donate-through-ddg'Ulrike Uhlig2018-03-152-295/+31
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'master' into wed/donate-through-ddgUlrike Uhlig2018-03-15139-10862/+13848
| | | |\ \ | | | |/ / | | |/| |
| | * | | Merge branch 'master' of webmasters.boum.org:wikiUlrike Uhlig2018-03-15148-10939/+13944
| | |\ \ \ | | | | |/ | | | |/|
| | | * | (no commit message)127.0.0.12018-03-151-0/+11
| | | * | Merge remote-tracking branch 'origin/master'sajolida2018-03-1416-164/+101
| | | |\ \
| | | | * \ Merge remote-tracking branch 'emmapeel/automatic_translations3.6'bertagaz2018-03-146-66/+88
| | | | |\ \
| | | | | * | automatic translations release 3.6emma peel2018-03-143-15/+16
| | | | | * | automatic translations release 3.6emma peel2018-03-144-51/+72
| | | * | | | Add output from 'Writing good documentation' metaphorssajolida2018-03-141-0/+53