commit | f63ebfe721aea79da67dc72125be7e77bf432682 | [log] [tgz] |
---|---|---|
author | Matteo Scandolo <matteo.scandolo@link-me.it> | Fri Oct 23 14:09:31 2015 +0200 |
committer | Matteo Scandolo <matteo.scandolo@link-me.it> | Fri Oct 23 14:09:31 2015 +0200 |
tree | 4dcf39923c4b1b79a4f3fd6a9d59ad92bc419b66 | |
parent | cc03252357cb0ba0e86da316f4617bcd1ed403af [diff] | |
parent | c18f97a47b9944d59b0d4e192a137ad5e7888334 [diff] |
Merge branch 'feature/contentProvider' into develop