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 /propositions | |
| parent | d72e5a93d36726d3ddb026f6c71b82f5d89c3e05 (diff) | |
| parent | 2e5ce0865dc0111623d72c44b2c93459cd7235b0 (diff) | |
Merge branch 'intgr/2018-board' into 2018-05-28-board
Conflicts:
2018/Makefile
Diffstat (limited to 'propositions')
0 files changed, 0 insertions, 0 deletions