1
0
Fork 0
arangodb/js/server
Frank Celler 939c5ece15 Merge branch '1.0' of github.com:triAGENS/ArangoDB
Conflicts:
	CHANGELOG
	CONTRIBUTING.md
	Doxygen/arango-html.doxy
	Doxygen/arango-latex.doxy
	Doxygen/arango-xml.doxy
	Doxygen/arango.template
	Makefile.in
	Makefile.local
	Makefile.unittests
	VERSION
	config/config.sub
	configure
	configure.ac
	js/actions/system/api-system.js
	js/client/js-client.h
	js/common/bootstrap/js-modules.h
	js/server/js-ahuacatl.h
	packetize.sh
2012-10-11 15:19:44 +02:00
..
modules Merge branch '1.0' of github.com:triAGENS/ArangoDB 2012-10-11 15:19:44 +02:00
tests Merge branch '1.0' of github.com:triAGENS/ArangoDB 2012-10-11 15:19:44 +02:00
ahuacatl.js added AQL function TO_LIST 2012-10-10 11:02:56 +02:00
arango-dfdb.js datafile check 2012-07-28 20:57:03 +02:00
arango-password.js removed user manager 2012-09-12 23:37:39 +02:00
arango-upgrade.js fixed task numbers 2012-09-26 14:08:03 +02:00
server.js harmonise API between client and server versions 2012-10-08 18:11:45 +02:00