1
0
Fork 0
arangodb/js/server
Jan Steemann ea2af50683 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	Documentation/ImplementorManual/HttpSystem.md
	js/apps/system/aardvark/aardvark.js
	js/apps/system/aardvark/frontend/css/buttons.css
	js/server/version-check.js
2014-01-24 14:50:09 +01:00
..
bootstrap updated CHANGELOG 2014-01-21 13:41:20 +01:00
modules/org Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-24 14:50:09 +01:00
tests Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-24 14:50:09 +01:00
arango-dfdb.js removed unused variables 2013-11-18 11:22:09 +01:00
server.js
version-check.js Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-24 14:50:09 +01:00