Date: | 2017-12-30 12:32:53 (3 years 20 days ago) |
---|---|
Author: | Nicola Fontana |
Branch: | master |
Commit: | 910d5121d1f39ee90acf339ad11ece9795248044 |
Parents: |
2ac5a630b2c7aea6a2a114fa6f648fd63eec0c24 9b8503624f5815272840824f55d777e97fe7c159 |
Message: | Merge branch 'dev' |