Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
arangodb/js/common/bootstrap
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
..
errors.js index creation with ids 2014-02-13 11:00:08 +01:00
module-console.js made module loader more node compatible, added coffee script support 2014-02-11 13:26:11 +01:00
module-fs.js Merge remote-tracking branch 'origin/devel' into sharding 2014-02-11 15:52:49 +01:00
module-internal.js ignore cache 2014-02-20 20:35:18 +01:00
modules.js fixed jslint warnings 2014-02-20 09:55:51 +01:00
monkeypatches.js fixed _shallowCopy, fixed creating of unknown attributes 2013-04-22 16:48:36 +02:00