diff options
author | intrigeri <intrigeri@boum.org> | 2015-02-28 12:34:54 +0000 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2015-02-28 12:34:54 +0000 |
commit | 31f8661eea49b05f32ccca4ad3d628548ba54b77 (patch) | |
tree | 93020168f8979b317c3a7c93e2b8ec154078385a /LICENSE | |
parent | 7c55bee06ab952c914b3a367f495e36a2539807f (diff) | |
parent | 8ed07cac2f084bfe542f4978daa783aedd7e79b4 (diff) |
Merge branch 'master' into 'master'
Merge with cmaisonnneuve and immerda
See merge request !4
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions