diff options
| author | Gustav Eek <gustav.eek@fripost.org> | 2019-05-07 22:40:32 +0200 |
|---|---|---|
| committer | Gustav Eek <gustav.eek@fripost.org> | 2019-05-07 22:40:32 +0200 |
| commit | 2e5ce0865dc0111623d72c44b2c93459cd7235b0 (patch) | |
| tree | ec325315b86fc3b7e2484e286f6c255a32e82df9 /2018/Makefile | |
| parent | c3f5e8b11d786023065fb1f826b5b4040c358756 (diff) | |
| parent | 17003dc40a21d4818fa65a15bc6bc2cc4159f9f7 (diff) | |
Merge branch 'intgr/2018-board' into 2018-08-27-board
Conflicts:
2018/Makefile
preamble/preamble.tex
Diffstat (limited to '2018/Makefile')
| -rw-r--r-- | 2018/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/2018/Makefile b/2018/Makefile index 317f0a9..3d4a901 100644 --- a/2018/Makefile +++ b/2018/Makefile @@ -2,8 +2,11 @@ MINUTES = \ 2018-01-22-board \ +2018-03-26-board \ +2018-04-23-board \ 2018-05-06-annual \ 2018-08-27-board \ +2018-10-22-board \ common-makefile = ../resources/Makefile-common |