aboutsummaryrefslogtreecommitdiffstats
path: root/2016/Makefile
diff options
context:
space:
mode:
authorGustav Eek <gustav@fripost.org>2015-03-02 20:25:10 +0100
committerGustav Eek <gustav@fripost.org>2015-03-02 20:25:10 +0100
commit4b3b4a69975aa2c8fb50173b76b0c7797e4ca5fb (patch)
tree40d3cf5343b10ddb4a4015bd719862827d9a17dd /2016/Makefile
parent705d0da59b9a2f364e36c3f06a5da38efa402d6b (diff)
parent9388183566e3eb4e12290535d04ea93c4f1850a9 (diff)
Merge branch 'june-16' into 'may-19'
Those branches contains minutes from May 19 and June 16, 2014. Conflict for '2014/Makefile' was solved.
Diffstat (limited to '2016/Makefile')
0 files changed, 0 insertions, 0 deletions