1
0
Fork 0
arangodb/js/apps/system/aardvark
Jan Steemann e9c5af7895 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsView.css
	js/apps/system/aardvark/frontend/css/layout.css
	js/apps/system/aardvark/frontend/js/routers/router.js
2014-01-30 19:40:21 +01:00
..
api-docs Merge remote-tracking branch 'origin/1.4' into devel 2014-01-23 22:24:20 +01:00
frontend Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-30 19:40:21 +01:00
lib Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-01-24 14:37:24 +01:00
test Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-30 19:40:21 +01:00
aardvark.js Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-24 14:50:09 +01:00
api-docs.json release version 1.4.7 2014-01-23 17:13:52 +01:00
cluster.js fixed web interface in non-cluster mode 2014-01-24 13:54:35 +01:00
favicon.ico adding favicon to ArangoDB web front-end 2013-11-21 16:31:40 +01:00
index.html ported web interface changes from devel to 1.4 2013-12-18 16:22:16 +01:00
manifest.json Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-30 19:40:21 +01:00