Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
arangodb/html/admin
History
Frank Celler 4605fbba9a Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 
Conflicts:
	CHANGELOG
	Doxygen/Examples.ArangoDB/startup1
	Makefile.in
	arangod/Documentation/command-line-options.dox
	arangod/Documentation/install-manual.dox
	arangod/Makefile.files
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/auth.h
	arangosh/V8Client/arangosh.cpp
	html/admin/css/layout.css
	lib/Basics/ssl-helper.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/ApplicationHttpServer.h
	lib/HttpServer/HttpServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.h
 		2012-07-24 22:56:03 +02:00
..
css Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 2012-07-24 22:56:03 +02:00
js Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 2012-07-24 22:56:03 +02:00
media stat windows now complete draggable resizable 2012-07-24 10:43:21 +02:00
favicon.ico new table configuration 2011-12-09 12:09:28 +01:00
index.html stat windows now complete draggable resizable 2012-07-24 10:43:21 +02:00