aboutsummaryrefslogtreecommitdiffstats
path: root/2014/2014-03-29-annual.tex
diff options
context:
space:
mode:
authorGustav Eek <gustav.eek@fripost.org>2020-01-14 06:55:20 +0100
committerGustav Eek <gustav.eek@fripost.org>2020-01-14 06:55:20 +0100
commit8de104dd0d273e84a504009f507e8ce5b4ae4e27 (patch)
treec8e63c7c76cccb5215f7fd94e65ffdbffbb834c9 /2014/2014-03-29-annual.tex
parentd0e54f0c653f021f18cc66adfe2cd4fed098ab72 (diff)
parent5a1d1b95993cd6f1184133bcf9c409ef74334acc (diff)
Merge branch 'master' into 2019-05-05-annual
Conflicts: preamble/preamble.tex preamble/acronyms.tex preamble/attendants.tex
Diffstat (limited to '2014/2014-03-29-annual.tex')
0 files changed, 0 insertions, 0 deletions