diff options
| author | Gustav Eek <gustav.eek@fripost.org> | 2019-05-07 22:28:29 +0200 |
|---|---|---|
| committer | Gustav Eek <gustav.eek@fripost.org> | 2019-05-07 22:28:29 +0200 |
| commit | 17003dc40a21d4818fa65a15bc6bc2cc4159f9f7 (patch) | |
| tree | 08ae173c75430d05d08a56dbe12b209440f1b0e1 /2018/Makefile | |
| parent | c001d764a688a3b4b62fefe551dd2c19e0e17fa9 (diff) | |
| parent | 608a59abb8a6beda80c0509fb8fdd20a7e628b08 (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 '2018/Makefile')
| -rw-r--r-- | 2018/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/2018/Makefile b/2018/Makefile index 136cd75..3562777 100644 --- a/2018/Makefile +++ b/2018/Makefile @@ -2,8 +2,10 @@ MINUTES = \ 2018-01-22-board \ +2018-03-26-board \ +2018-04-23-board \ 2018-05-06-annual \ -2018-10-22-board \ +2018-10-22-board \ common-makefile = ../resources/Makefile-common |