diff options
| author | Gustav Eek <gustav.eek@fripost.org> | 2019-05-07 22:57:40 +0200 |
|---|---|---|
| committer | Gustav Eek <gustav.eek@fripost.org> | 2019-05-07 22:57:40 +0200 |
| commit | 2e45e78e3b748deed03ceec43d6769532f08cd78 (patch) | |
| tree | 71fac120a34a1c5c68af16d26d7b86d0acffb7ba /2018/Makefile | |
| parent | d72e5a93d36726d3ddb026f6c71b82f5d89c3e05 (diff) | |
| parent | 2e5ce0865dc0111623d72c44b2c93459cd7235b0 (diff) | |
Merge branch 'intgr/2018-board' into 2018-05-28-board
Conflicts:
2018/Makefile
Diffstat (limited to '2018/Makefile')
| -rw-r--r-- | 2018/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/2018/Makefile b/2018/Makefile index ac00f0f..d284655 100644 --- a/2018/Makefile +++ b/2018/Makefile @@ -2,8 +2,12 @@ MINUTES = \ 2018-01-22-board \ +2018-03-26-board \ +2018-04-23-board \ 2018-05-06-annual \ 2018-05-28-board \ +2018-08-27-board \ +2018-10-22-board \ common-makefile = ../resources/Makefile-common |