commit | 4c0bca3529bb29c6985a5d300160d3b4dafba51c | [log] [tgz] |
---|---|---|
author | Matteo Scandolo <matteo.scandolo@link-me.it> | Wed Oct 21 11:08:05 2015 +0200 |
committer | Matteo Scandolo <matteo.scandolo@link-me.it> | Wed Oct 21 11:08:05 2015 +0200 |
tree | 3f9e51cb37c1b9d9bd970cff8cfab193c32f9421 | |
parent | b316dea9a7dc004cb9370439b488da4c87622174 [diff] | |
parent | 8a0fc41ce2dff905f3d46cd808585d479e19c7ed [diff] |
Merge branch 'master' into feature/contentProvider