| commit | 31396aa53c2b2eb0657cd145d9deefd736d47cbe | [log] [tgz] |
|---|---|---|
| author | Matteo Scandolo <matteo.scandolo@link-me.it> | Wed Oct 21 11:07:56 2015 +0200 |
| committer | Matteo Scandolo <matteo.scandolo@link-me.it> | Wed Oct 21 11:07:56 2015 +0200 |
| tree | 7485a6d76b334dc22ba07ade2e9cdd9aef09e406 | |
| parent | 7abedf17d4419c76e4ae2bb2f853777413be13c1 [diff] | |
| parent | 6667ddc8af6a412c68a6d833c6a6290c7184322c [diff] |
Merge branch 'master' of https://github.com/open-cloud/xos into feature/contentProvider