aboutsummaryrefslogtreecommitdiffstats
path: root/2014/Makefile
diff options
context:
space:
mode:
authorGustav Eek <gustav.eek@etraveli.com>2017-05-09 21:53:15 +0200
committerGustav Eek <gustav.eek@etraveli.com>2017-05-09 21:53:15 +0200
commitb5b613ed628948d38968e897b6d4558d227c613e (patch)
treea7366bdc47261522b584c684b23ba44e7ae5d844 /2014/Makefile
parentad33c470cc6f8878afd24133f4ffd1db7acff5ca (diff)
parentbbdb2e6b58317aac124c0bf176bd2e67b4ed4413 (diff)
Merge branch '2016-04-17-annual' into 2017-05-13-annual
Conflicts: 2016/Makefile agenda/Makefile
Diffstat (limited to '2014/Makefile')
0 files changed, 0 insertions, 0 deletions