summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/devel' into feature/16390-linux-4.19.0-2...feature/16390-linux-4.19.0-2+force-all-testsintrigeri2019-01-2847-1282/+970
|\
| * Merge branch 'testing' into develanonym2019-01-2847-1282/+970
| |\
| | * Update PO files.anonym2019-01-289-41/+87
| | * Merge remote-tracking branch 'origin/feature/16388-tor-browser-8.0.5+force-al...anonym2019-01-282-26/+26
| | |\
| | | * Upgrade Tor Browser to 8.0.5-build2.anonym2019-01-252-26/+26
| | * | Partially revert "Fix more buggy master → devel merge conflict resolutions."anonym2019-01-286-19/+17
| | * | Merge remote-tracking branch 'xin/translate/3.12' into testinganonym2019-01-2824-1080/+747
| | |\ \
| | | * \ Merge remote-tracking branch 'origin/testing' into translate/3.12xin2019-01-2747-1173/+2798
| | | |\ \ | | | |/ / | | |/| |
| | * | | Merge remote-tracking branch 'xin/review/chre/networkmanager' into testinganonym2019-01-272-55/+70
| | |\ \ \
| | | * | | [fr] improve translationxin2019-01-192-15/+15
| | | * | | .../src/doc/anonymous_internet/networkmanager.fr.poChre2019-01-192-55/+70
| | * | | | Merge remote-tracking branch 'xin/translate/testing/3.12' into testinganonym2019-01-274-61/+23
| | |\ \ \ \
| | | * | | | [fr] update translationxin2019-01-194-61/+23
| | | |/ / /
| | | | * | [fr] update translationxin2019-01-1913-295/+182
| | | | * | Update PO filesxin2019-01-192-278/+396
| | | | * | Merge remote-tracking branch 'origin/bugfix/16376-fix-buggy-merge' into trans...xin2019-01-19387-14008/+14401
| | | | |\ \
| | | | * | | [fr] update translationxin2019-01-105-115/+139
| | | | * | | Merge branch 'feature/15292-usb-image' of https://git-tails.immerda.ch/tails ...xin2019-01-108-26/+170
| | | | |\ \ \
| | | | * \ \ \ Merge branch 'feature/15292-usb-image' of https://git-tails.immerda.ch/tails ...xin2019-01-091-0/+0
| | | | |\ \ \ \
| | | | * | | | | [fr] update translationxin2019-01-097-395/+170
| | | | * | | | | Merge branch 'feature/15292-usb-image' of https://git-tails.immerda.ch/tails ...xin2019-01-0913-43/+106
| | | | |\ \ \ \ \
| | | | * | | | | | [fr] update translationxin2019-01-0913-382/+308
* | | | | | | | | | Revert "Pin the kernel version we want to install in Tails 3.12." (refs: #16390)intrigeri2019-01-261-1/+1
* | | | | | | | | | Upgrade Linux to 4.19.0-2, i.e. currently 4.19.16-1 (refs: #16390)intrigeri2019-01-261-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'testing' into develintrigeri2019-01-2519-1091/+2856
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge remote-tracking branch 'origin/lamby/bugfix/16386-force-basebox-regener...intrigeri2019-01-254-3/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Bump the APT snapshot serial in the vagrant builder for "debian{,-security}" ...Chris Lamb2019-01-253-3/+3
| | * | | | | | | | Dummy commit to force regeneration of basebox for CVE-2019-3462 in apt. (Clos...Chris Lamb2019-01-241-0/+1
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Update website PO files.anonym2019-01-256-1063/+2830
| * | | | | | | | Fix more buggy master → devel merge conflict resolutions.anonym2019-01-2510-26/+23
* | | | | | | | | Merge branch 'testing' into develintrigeri2019-01-252-6/+41
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'bugfix/16383-printer-config+force-all-tests' into testing (Fix-...intrigeri2019-01-251-2/+27
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Preserve setuid & setgid bits when giving files back to their renumbered owne...intrigeri2019-01-241-2/+27
| |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'xin/review/chre/fr.po' into testingsajolida2019-01-211-4/+14
| |\ \ \ \ \ \ \
| | * | | | | | | [fr] improve translationxin2019-01-191-3/+3
| | * | | | | | | tails/po/fr.po updateChre2019-01-191-4/+14
| | |/ / / / / /
* | | | | | | | Merge branch 'testing' into develanonym2019-01-211-80/+179
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'origin/bugfix/16376-fix-buggy-merge' into testi...anonym2019-01-211-80/+179
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Fix buggy master → devel merge conflict resolution.intrigeri2019-01-191-80/+179
* | | | | | | | Merge branch 'testing' into develanonym2019-01-211-0/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add dummy changelog entry for 3.12.anonym2019-01-211-0/+6
* | | | | | | | Add dummy changelog entry for 3.13.anonym2019-01-211-0/+6
* | | | | | | | Merge branch 'testing' into develanonym2019-01-21102-2395/+4934
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'origin/master' into testinganonym2019-01-2117-44/+281
| |\ \ \ \ \ \ \
| | * | | | | | | Revert spam.intrigeri2019-01-211-0/+10
| | * | | | | | | Revert spam.intrigeri2019-01-211-0/+9
| | * | | | | | | Revert spam.intrigeri2019-01-211-2/+2
| | * | | | | | | Revert spam.intrigeri2019-01-211-3/+6
| | * | | | | | | Revert spam.intrigeri2019-01-211-2/+2
| | * | | | | | | Revert spam.intrigeri2019-01-211-1/+1