| commit | 0b19c1d80bfcdd7edd737bb95fc600bbcf1201cb | [log] [tgz] |
|---|---|---|
| author | Matteo Scandolo <matteo.scandolo@link-me.it> | Wed Oct 21 19:10:57 2015 +0200 |
| committer | Matteo Scandolo <matteo.scandolo@link-me.it> | Wed Oct 21 19:10:57 2015 +0200 |
| tree | 0d6f29c6b31fc0e1585f78c64c7623e1f9456209 | |
| parent | 3f2d98360229794ec7c2c581e63dccd7df851cca [diff] | |
| parent | 7d06aab969a6c2299bb3d5899f8a7529311753cb [diff] |
Merge branch 'master' of https://github.com/open-cloud/xos into feature/contentProvider