| commit | 19b9e3a0d0ea48566231a8c8826d89dbecbbb99b | [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 | 25616e06d3f680a5ade1aff9add0432836aad028 [diff] | |
| parent | bcded49f2ae0b886aa87a2bc7dd6df02e5a1ef43 [diff] |
Merge branch 'master' of https://github.com/open-cloud/xos into feature/contentProvider