aboutsummaryrefslogtreecommitdiffstats
path: root/2012
diff options
context:
space:
mode:
authorGustav Eek <gustav.eek@fripost.org>2019-05-07 22:28:29 +0200
committerGustav Eek <gustav.eek@fripost.org>2019-05-07 22:28:29 +0200
commit17003dc40a21d4818fa65a15bc6bc2cc4159f9f7 (patch)
tree08ae173c75430d05d08a56dbe12b209440f1b0e1 /2012
parentc001d764a688a3b4b62fefe551dd2c19e0e17fa9 (diff)
parent608a59abb8a6beda80c0509fb8fdd20a7e628b08 (diff)
Merge branch 'intgr/2018-board' into 2018-10-22-board
Conflicts: 2018/Makefile agenda/Makefile preamble/preamble.tex resources/board-minutes-template-en.tex resources/board-minutes-template-sv.tex
Diffstat (limited to '2012')
0 files changed, 0 insertions, 0 deletions