sofusmortensen 5d5bcbfb00 Merge branch 'master' into dynamic-loading		2016-03-22 13:37:33 +00:00
..
src	Merge branch 'master' into dynamic-loading	2016-03-22 13:37:33 +00:00
build.gradle	Don't report errors when dependency version conflicts are found, as Gradle's default behaviour of picking the newest version is normally the right one and in practice what we've been doing anyway.	2016-03-11 11:49:50 +01:00