Jan Steemann fa6e98d94c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh ... Conflicts: js/apps/system/aardvark/frontend/js/bootstrap/errors.js		2014-06-11 17:40:15 +02:00
..
actions	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh	2014-06-11 14:23:47 +02:00
apps/system	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel	2014-06-11 14:52:10 +02:00
client	Added fetchFromGithub to server-side foxx manager. Makes it a lot easier to update an already installed foxx from aardvark	2014-06-06 15:00:26 +02:00
common	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh	2014-06-11 17:40:15 +02:00
node	changed eol	2014-06-06 15:11:49 +02:00
server	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh	2014-06-11 17:40:15 +02:00
GUIDELINES.md	…
Makefile.files	…