Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
arangodb/js/common/modules/org
History
Frank Celler b01d9d77e7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
	js/apps/system/aardvark/frontend/scss/generated.css
	js/server/version-check.js
	lib/Dispatcher/Job.h
	lib/GeneralServer/GeneralServerJob.h
 		2014-02-20 21:02:07 +01:00
..
arangodb Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-20 21:02:07 +01:00
arangodb-common.js removed some unused variables 2014-01-31 11:23:27 +01:00