diff options
| author | Gustav Eek <gustav@fripost.org> | 2015-03-02 21:53:27 +0100 |
|---|---|---|
| committer | Gustav Eek <gustav@fripost.org> | 2015-03-02 21:53:27 +0100 |
| commit | 2784a5345920940253a0501041a0b101df952a0b (patch) | |
| tree | a3c06a1e437d791ea9f85cf570b2f13d3c27d25b /2014/Makefile | |
| parent | 8c9f57713b34a6a1e9e8a2c67aa17c43e644ad2e (diff) | |
| parent | 1ca554c9240399d7d7d4a56ea6f5d9bd4a839765 (diff) | |
Merge branch 'apr-21' containing minutes from April 21, 2014
Conflicting '2014/Makefile'
Diffstat (limited to '2014/Makefile')
| -rw-r--r-- | 2014/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/2014/Makefile b/2014/Makefile index 7dec96e..e25e111 100644 --- a/2014/Makefile +++ b/2014/Makefile @@ -4,6 +4,7 @@ MINUTES = \ 2014-02-11-board \ 2014-02-24-board \ 2014-03-29-annual \ +2014-04-21-board \ 2014-05-19-board \ 2014-05-19-board-excerpt \ 2014-06-16-board |