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
..
actions	Merge remote-tracking branch 'origin/devel' into sharding	2013-12-20 15:35:50 +01:00
apps/system/aardvark	Merge remote-tracking branch 'origin/devel' into sharding	2013-12-20 15:35:50 +01:00
client	improved error and help messages	2013-12-04 22:42:05 +01:00
common	Merge remote-tracking branch 'origin/devel' into sharding	2013-12-20 15:35:50 +01:00
node	added coffee-script	2013-04-21 22:57:19 +02:00
npm	added sinon, upgraded underscore and coffe-script	2013-09-20 17:46:52 +02:00
server	Merge remote-tracking branch 'origin/devel' into sharding	2013-12-20 15:35:50 +01:00
GUIDELINES.md	…
Makefile.files	removed redundant startup options	2013-11-20 01:50:27 +01:00