diff options
author | nicolargo <nicolashennion@gmail.com> | 2016-03-16 17:42:09 +0100 |
---|---|---|
committer | nicolargo <nicolashennion@gmail.com> | 2016-03-16 17:42:09 +0100 |
commit | adb900d4b02da07006fdcc9ecb3266b93018521f (patch) | |
tree | f1da58b5dde6692affbb781d025556efc6e7f1a5 | |
parent | bcff18231d0c6866af85a654f2af6f2251601af9 (diff) | |
parent | 278add2bcfe77d6d1bf89c8ad9ddf2c0e690f41d (diff) |
Merge branch 'develop'v2.6