aboutsummaryrefslogtreecommitdiffstats
path: root/2015/Makefile
diff options
context:
space:
mode:
authorGustav Eek <gustav@fripost.org>2015-03-06 08:29:20 +0100
committerGustav Eek <gustav@fripost.org>2015-03-06 08:29:20 +0100
commit1d5cf0f448b08d398f7edee472815844926e5de4 (patch)
treee6af9a153673b827d3b22d3b64c8917b0b4103a7 /2015/Makefile
parent2784a5345920940253a0501041a0b101df952a0b (diff)
parenta52f1ab9f85cf9583c0608708093db6d004ffee4 (diff)
Merge branch 'sep-8-2014', September 8, 2014 board meeting minutes
Conflicts appeard for '2014/Makefile' and 'preamble/preamble.tex'. Those were solved.
Diffstat (limited to '2015/Makefile')
0 files changed, 0 insertions, 0 deletions