Frank Celler f9dba124dd Merge remote-tracking branch 'origin/issue317' into 1.1 ... Conflicts: js/common/bootstrap/modules.js		2013-01-03 18:57:18 +01:00
..
modules	Merge remote-tracking branch 'origin/issue317' into 1.1	2013-01-03 18:57:18 +01:00
tests	issue #327	2012-12-27 18:26:04 +01:00
ArangoStructure.js	updated error codes	2013-01-03 16:31:55 +01:00
ahuacatl.js	issue #327	2012-12-27 18:26:04 +01:00
arango-dfdb.js	renamed execute/load to executelocal and executeglobal	2013-01-02 14:52:55 +01:00
arango-password.js	windows fixes	2012-12-20 17:17:30 +08:00
server.js	updated error codes	2013-01-03 16:31:55 +01:00
version-check.js	updated error codes	2013-01-03 16:31:55 +01:00