Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
arangodb/js/common/bootstrap
History
Jan Steemann 23ba186b0d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/CapConstraint/cap-constraint.c
	js/apps/system/aardvark/frontend/scss/_tiles.scss
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/frontend/scss/style.scss
	js/common/modules/org/arangodb/users-common.js
 		2014-02-25 17:21:14 +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 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-25 17:21:14 +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