summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Mark one more Pidgin test as fragile."test/11453-chatting-with-some-friend-over-xmpp-is-fragileintrigeri2016-06-101-2/+1
* Merge branch 'stable' into test/11453-chatting-with-some-friend-over-xmpp-is-...intrigeri2016-06-10342-14647/+24535
|\
| * Mark one more Pidgin test as fragile.intrigeri2016-06-101-1/+2
| * 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
| * | | Restore stable's base branch.anonym2016-06-081-1/+1
| * | | Also remove unreleased changelog entries.anonym2016-06-081-4/+5
| * | | 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 '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
| | |\ \ \ \ | | | |/ / /
| | | * | | 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
| | | * | 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
| | | * | Updating SquashFS sort fileanonym2016-06-061-4630/+4590
| | | * | Mark 2.4 as "UNRELEASED" in debian/changelog.anonym2016-06-061-1/+1
| | | * | Update website PO files.anonym2016-06-0614-167/+1349
| | | * | Update version and date for 2.4.anonym2016-06-0612-17/+17
| | | * | We'll have Tor Browser 6.0.1 in Tails 2.4.anonym2016-06-061-1/+1
| | | * | Fix typo.anonym2016-06-061-1/+1
| | | * | Add known issue in Tails 2.4.anonym2016-06-061-0/+5
| | | * | Merge remote-tracking branch 'origin/doc/11503-icedove-autoconfig' into testinganonym2016-06-063-35/+25
| | | |\ \
| | | | * | Update screenshotsajolida2016-06-041-0/+0
| | | | * | Shortensajolida2016-06-041-5/+2
| | | | * | Now we have the autoconfig (Will-fix: #11503)sajolida2016-06-041-13/+10
| | | | * | Merge remote-tracking branch 'spriver/review-de_doc' into testingsajolida2016-06-041-19/+15
| | | | |\ \
| | | | | * | Unified translationspriver2016-05-301-11/+12
| | | | | * | reviewed changes and made some small adjustmentsMuri Nicanor2016-05-301-6/+6
| | | | | * | Merge remote-tracking branch 'spriver/de_doc' into review-de_docMuri Nicanor2016-05-301-13/+8
| | | | | |\ \
| | | | | | * | Translated new translated stringsspriver2016-05-281-13/+8
| | | * | | | | Merge remote-tracking branch 'origin/web/11369-2.4-release-notes' into testinganonym2016-06-062-1/+106
| | | |\ \ \ \ \
| | | | * | | | | Many little fixessajolida2016-06-021-8/+8