diff options
| author | Maxime Quandalle <maxime@quandalle.com> | 2015-10-20 20:06:26 +0200 |
|---|---|---|
| committer | Maxime Quandalle <maxime@quandalle.com> | 2015-10-20 20:06:26 +0200 |
| commit | 7a5f030cc807c6a0a5addd8da59dc853dd4bd426 (patch) | |
| tree | 784e5197277b8971eced858e1be9efb88b973cfd /client/components/sidebar/sidebar.js | |
| parent | f3fc154eb0cf25c46871510a0d4004037188ec15 (diff) | |
| parent | 118b434a5aad35df8eefea85624ab9abafab56f0 (diff) | |
| download | wekan-7a5f030cc807c6a0a5addd8da59dc853dd4bd426.tar.gz wekan-7a5f030cc807c6a0a5addd8da59dc853dd4bd426.tar.bz2 wekan-7a5f030cc807c6a0a5addd8da59dc853dd4bd426.zip | |
Merge branch 'xavierpriour-devel' into devel
Conflicts:
models/import.js
Diffstat (limited to 'client/components/sidebar/sidebar.js')
0 files changed, 0 insertions, 0 deletions