summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Patch live-boot to support bind-mounting individual files.feature/11533-persistent-bind-mounted-filesanonym2016-06-151-0/+38
* Merge branch 'stable' into develintrigeri2016-06-101-1/+2
|\
| * Mark one more Pidgin test as fragile.intrigeri2016-06-101-1/+2
* | Merge remote-tracking branch 'origin/devel' into develanonym2016-06-081-0/+6
|\ \
| * | Add changelog dummy entry for 2.6.intrigeri2016-06-081-0/+6
* | | Merge remote-tracking branch 'origin/stable' into develanonym2016-06-082-0/+7
|\ \ \ | |/ / |/| / | |/
| * Merge remote-tracking branch 'origin/bugfix/11500-slow-qxl' into stableanonym2016-06-082-0/+7
| |\
| | * Merge remote-tracking branch 'origin/testing' into bugfix/11500-slow-qxlintrigeri2016-06-0751-4903/+6341
| | |\
| | * | Only enable QXL -specific X.Org configuration when a QXL graphic card is dete...intrigeri2016-06-062-0/+1
| | * | Revert "Revert "Disable surfaces support in QXL X.Org video driver.""intrigeri2016-06-061-0/+6
* | | | Merge branch 'stable' into develanonym2016-06-081-4/+5
|\ \ \ \ | |/ / /
| * | | Restore stable's base branch.anonym2016-06-081-1/+1
| * | | Also remove unreleased changelog entries.anonym2016-06-081-4/+5
* | | | Merge branch 'stable' into develanonym2016-06-081-6/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' into stableanonym2016-06-081-6/+0
| |\ \ \
| | * \ \ Merge branch 'testing'anonym2016-06-081-6/+0
| | |\ \ \
| | | * | | Remove changelog entries for releases that were never released.anonym2016-06-081-6/+0
* | | | | | Merge branch 'stable' into develanonym2016-06-0830-616/+354
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'master' into stableanonym2016-06-08425-14695/+25130
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'testing'anonym2016-06-082-2/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Thaw APT snapshots after Tails $VERSION was released.anonym2016-06-082-2/+2
| | * | | | Remove UDFs for versions that were never released.anonym2016-06-084-42/+0
| | * | | | updated PO filesamnesia2016-06-0810-344/+112
| | * | | | Update Known Issues and FAQ after releasing Tails 2.4.anonym2016-06-082-38/+1
| | * | | | Document the Icinga2 and VPN setup for contributors.bertagaz2016-06-071-0/+31
| | * | | | Merge remote-tracking branch 'origin/testing'anonym2016-06-07361-11397/+24186
| | |\ \ \ \ | | | |/ / /
| | * | | | Merge remote-tracking branch 'xin/translate/wiki/src'intrigeri2016-06-076-75/+89
| | |\ \ \ \
| | | * | | | [fr] wiki/srcxin2016-06-056-75/+89
| | * | | | | Merge remote-tracking branch 'atomike/xin-support'intrigeri2016-06-073-83/+72
| | |\ \ \ \ \
| | | * | | | | Update wiki/src/support/faq.fr.poAtomiKe2016-06-061-7/+6
| | | * | | | | Merge branch 'translate/support' of https://git-tails.immerda.ch/xin/tails in...AtomiKe2016-06-063-84/+74
| | | |\ \ \ \ \
| | | | * | | | | [fr] wiki/src/support/xin2016-05-313-84/+74
| | * | | | | | | Add alpha channel upgrade paths to 2.4.anonym2016-06-064-33/+48
| | * | | | | | | Updating trace file after uploading 2.4.anonym2016-06-061-1/+1
| | |/ / / / / /
| * | | | | | | Merge remote-tracking branch 'origin/master' into stablesajolida2016-06-0181-2328/+3557
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'testing' into develanonym2016-06-0723-248/+6454
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | releasing version 2.4anonym2016-06-0722-242/+6448
| * | | | | | | | Add missing words.anonym2016-06-071-1/+1
| * | | | | | | | Improve wording.anonym2016-06-071-3/+3
| * | | | | | | | Clarify manual test.anonym2016-06-071-4/+4
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Add dummy changelog entry.anonym2016-06-071-0/+6
* | | | | | | | Merge remote-tracking branch 'origin/testing' into develanonym2016-06-0751-4903/+6341
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add dummy changelog entry.anonym2016-06-071-0/+6
| * | | | | | | Update IDF file for DAVE.anonym2016-06-061-3/+3
| * | | | | | | Improve release automation.anonym2016-06-061-6/+4
| * | | | | | | Improve release automation.anonym2016-06-061-8/+8
| * | | | | | | Update upgrade-description files.anonym2016-06-0616-26/+182
| * | | | | | | We don't do RCs for emergency releases.anonym2016-06-061-1/+0
| * | | | | | | Only mark version as "released" when building the final ISO image.anonym2016-06-062-2/+7
| * | | | | | | Mark 2.4 as released.2.4anonym2016-06-061-2/+2