Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
28,771 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

6 Commits

Author SHA1 Message Date
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
 2016-04-19 07:44:00 +02:00
Alan Plum 1f347b3145
Update license headers 2016-04-18 18:00:30 +02:00
Frank Celler 3f9dd62d4c WIP 2016-04-13 12:30:18 +02:00
Alan Plum de9ae5128a underscore -> lodash 2015-12-23 23:30:55 +01:00
jsteemann 3d6582ed52 micro optimizations 2015-12-22 21:58:20 +01:00
Alan Plum 8853ede355 org/arangodb -> @arangodb 2015-12-15 15:51:44 +01:00