Date: | 2017-12-29 10:21:23 (3 years 21 days ago) |
---|---|
Author: | Nicola Fontana |
Branch: | dev, master |
Commit: | 2ac5a630b2c7aea6a2a114fa6f648fd63eec0c24 |
Parents: |
641102ed275760177c2c0b81a8750b401cd9f0ec d9bc20cf872a26aa87f50d12fb332fa624e6707e |
Message: | Merge branch 'dev' |