1
0
Fork 0
arangodb/arangod/Actions
a-brandt 1c0578c2b5 Merge branch 'devel' into multiple_databases
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/vocbase.c
	lib/HttpServer/ApplicationEndpointServer.cpp
	lib/HttpServer/ApplicationEndpointServer.h
	lib/HttpServer/HttpCommTask.h
	lib/HttpServer/HttpHandlerFactory.cpp
	lib/HttpServer/HttpHandlerFactory.h
	lib/Rest/HttpRequest.cpp
	lib/Rest/HttpRequest.h
2013-06-03 17:05:01 +02:00
..
RestActionHandler.cpp Merge branch 'devel' into multiple_databases 2013-06-03 17:05:01 +02:00
RestActionHandler.h merged patches by @guidoreina 2013-05-21 11:33:43 +02:00
actions.cpp updated disclaimer 2013-03-13 17:03:18 +01:00
actions.h updated disclaimer 2013-03-13 17:03:18 +01:00