1
0
Fork 0
arangodb/js
Frank Celler 055e172bdb Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4
Conflicts:
	arangod/Replication/Syncer.cpp
	arangod/VocBase/index-garbage-collector.c
	build_posix.h
	html/admin/api-docs/traversal.json
	js/apps/aardvark/api-docs/collection.json
	js/apps/aardvark/api-docs/cursor.json
	js/apps/aardvark/api-docs/document.json
	js/apps/aardvark/api-docs/edge.json
	js/apps/aardvark/api-docs/edges.json
	js/apps/aardvark/api-docs/graph.json
	js/apps/aardvark/api-docs/index.json
	js/apps/aardvark/api-docs/replication.json
	js/apps/aardvark/api-docs/simple.json
	js/apps/aardvark/api-docs/system.json
2013-09-05 13:03:07 +02:00
..
actions Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4 2013-09-05 13:03:07 +02:00
apps/aardvark Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4 2013-09-05 13:03:07 +02:00
client Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-05 12:43:17 +02:00
common Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-04 15:58:49 +02:00
node added coffee-script 2013-04-21 22:57:19 +02:00
npm moved underscore to npm 2013-04-23 22:42:32 +02:00
server Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-05 12:43:17 +02:00
GUIDELINES.md
Makefile.files fixed web interface paths 2013-08-26 16:35:47 +02:00