1
0
Fork 0
arangodb/html/admin
Frank Celler 128cb67c8b Merge remote-tracking branch 'origin/1.1' into devel
Conflicts:
	Documentation/Examples/shell-read-document-bad-handle
	Makefile.in
	arangod/Documentation/shell-document.dox
	configure
	js/actions/system/api-collection.js
	js/actions/system/api-index.js
	js/actions/system/api-system.js
	js/common/bootstrap/modules.js
	js/common/bootstrap/print.js
	js/server/ArangoCollection.js
	lib/V8/v8-utils.cpp
2013-01-09 15:30:21 +01:00
..
css a bit of UI frickeling 2013-01-03 16:41:22 +01:00
js Merge remote-tracking branch 'origin/1.1' into devel 2013-01-09 15:30:21 +01:00
media optimized statistics 2012-08-01 12:59:13 +02:00
favicon.ico new table configuration 2011-12-09 12:09:28 +01:00
index.html Merge remote-tracking branch 'origin/1.1' into devel 2013-01-09 15:30:21 +01:00