Jan Steemann b903d9080d Merge remote-tracking branch 'origin/devel' into sharding ... Conflicts: js/apps/system/aardvark/test/karma/karma.conf.js		2013-12-20 15:35:50 +01:00
..
bootstrap	Merge remote-tracking branch 'origin/devel' into sharding	2013-12-20 15:35:50 +01:00
modules	moved server-only tests to js/server/tests	2013-12-04 22:05:00 +01:00
test-data	fix require bug for modules	2013-09-20 17:46:07 +02:00
tests	fixed issue #711, #687	2013-12-20 15:13:23 +01:00