merge
Merge branch 'master' of https://git-tails.immerda.ch/tails
Merge branch 'master' of https://git-tails.immerda.ch/tails
merge
merge
set up donation form, adjust bitcoin donation
improve layout, markup
merge conflicts
Merge branch 'master' into web/donation
simplifying and adding info for receipt
Merge branch 'master' of https://git-tails.immerda.ch/tails
resolve faulty merge
Merge branch 'master' into web/donation
Merge branch 'master' of https://git-tails.immerda.ch/tails
Merge branch 'master' of git://git.tails.boum.org/tails
Merge branch 'master' of https://git-tails.immerda.ch/tails
Merge branch 'master' into web/donation
Merge branch 'master' of https://git-tails.immerda.ch/tails
Merge branch 'master' into web/donation
Redirection donation button to our donation page