1
0
Fork 0
Commit Graph

402 Commits

Author SHA1 Message Date
Frank Celler 313c3c31ed Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangosh/V8Client/arangosh.cpp
2012-06-08 15:13:01 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00