Frank Celler 9127ed2ac5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel ... Conflicts: js/apps/system/aardvark/frontend/scss/_newDashboard.scss js/apps/system/aardvark/frontend/scss/generated.css		2014-05-12 00:07:46 +02:00
..
actions	Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel	2014-05-12 00:07:46 +02:00
apps/system	Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel	2014-05-12 00:07:46 +02:00
client	issue #839: Foxx Manager missing "unfetch"	2014-04-23 15:09:03 +02:00
common	added tasks manual entry	2014-05-10 02:25:59 +02:00
node	fix coffee script parse error error	2014-03-04 18:45:40 +01:00
server	added more delay for busy workers	2014-05-10 02:34:18 +02:00
GUIDELINES.md	…
Makefile.files	fixed return value of `make jslint`	2014-03-10 09:37:23 +01:00