| commit | b316dea9a7dc004cb9370439b488da4c87622174 | [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 | f21d3359a07940cf474661744e93bc814ed5df86 [diff] | |
| parent | e337e51583c4f563fb48cfd7a5d02d61a3d533f9 [diff] |
Merge branch 'master' of https://github.com/open-cloud/xos into feature/contentProvider