Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
arangodb/js/apps/system/aardvark/frontend
History
Michael Hackstein 015ab56259 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	arangod/VocBase/document-collection.c
	arangosh/CMakeLists.txt
	js/apps/system/aardvark/test/karma/karma.conf.js
 		2014-02-18 08:50:27 +01:00
..
css Merge remote-tracking branch 'origin/devel' into sharding 2014-02-18 08:50:27 +01:00
fonts Added new version of graphViewer Icons 2014-02-03 11:42:18 +01:00
html Merge remote-tracking branch 'origin/devel' into sharding 2014-02-18 08:50:27 +01:00
img Merge remote-tracking branch 'origin/devel' into sharding 2014-02-18 08:50:27 +01:00
js Merge remote-tracking branch 'origin/devel' into sharding 2014-02-18 08:50:27 +01:00
scss Merge remote-tracking branch 'origin/devel' into sharding 2014-02-18 08:50:27 +01:00
src use per-database directories for Foxx apps 2013-09-30 10:57:29 +02:00
ttf ported web interface changes from devel to 1.4 2013-12-18 16:22:16 +01:00
aqltemplates.json issue #647: fixed tooltips 2013-10-29 00:42:39 +01:00
favicon.ico use per-database directories for Foxx apps 2013-09-30 10:57:29 +02:00