Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
arangodb/html/admin/js/modules/org
History
Frank Celler 7def1cf29f Merge remote-tracking branch 'origin/feature/commonjs' into devel 
Conflicts:
	apps/aardvark/manifest.json
	apps/aardvark/manifestComplete.json
	etc/arangodb/arangod.conf.in
	etc/relative/arangod.conf
	html/admin/js/bootstrap/module-internal.js
	js/apps/aardvark/assets/collections/foxxCollection.js
	js/apps/aardvark/assets/index.html
	js/apps/aardvark/assets/lib/backbone.js
	js/apps/aardvark/assets/lib/jquery.js
	js/apps/aardvark/assets/lib/underscore.js
	js/apps/aardvark/assets/models/foxx.js
	js/apps/aardvark/assets/views/foxxListView.js
	js/apps/aardvark/assets/views/foxxView.js
	js/apps/aardvark/index.html
	js/apps/aardvark/manifest.json
	js/common/bootstrap/module-internal.js
 		2013-03-31 12:46:16 +02:00
..
arangodb cleanup of internal, fs, console 2013-03-31 00:10:48 +01:00
arangodb-common.js Merge remote-tracking branch 'origin/feature/commonjs' into devel 2013-03-31 12:46:16 +02:00
arangodb.js fixed browser shell 2013-01-18 12:34:29 +01:00