Frank Celler 36da27ac6f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel ... Conflicts: Documentation/DbaManual/Authentication.md Documentation/DbaManual/UserManagementTOC.md js/common/modules/org/arangodb/users.js		2013-02-20 13:52:20 +01:00
..
actions/system	issue #393, issue #128	2013-02-20 11:56:26 +01:00
client	added replaceByExample() and updateByExample() methods	2013-02-19 11:38:55 +01:00
common	Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel	2013-02-20 13:52:20 +01:00
server	issue #393, issue #128	2013-02-20 11:56:26 +01:00
GUIDELINES.md	fixed typos	2013-01-18 17:10:24 +01:00
Makefile.files	fixed gui	2013-02-02 16:09:15 +01:00