1
0
Fork 0
arangodb/js
Jan Steemann 2e617ac0cc Merge branch 'american-english' of https://github.com/CoDEmanX/ArangoDB into devel
Conflicts:
	arangod/Wal/Slots.cpp
	lib/Basics/debugging.cpp
	lib/Basics/files.cpp
2015-09-02 13:14:49 +02:00
..
actions Change spelling of 'initialize' to American English (comments and log messages only) 2015-09-01 17:07:21 +02:00
apps/system Merge branch 'american-english' of https://github.com/CoDEmanX/ArangoDB into devel 2015-09-02 13:14:49 +02:00
client Change spelling of 'initialize' to American English (comments and log messages only) 2015-09-01 17:07:21 +02:00
common Merge branch 'american-english' of https://github.com/CoDEmanX/ArangoDB into devel 2015-09-02 13:14:49 +02:00
contrib
node Added highlight.js 2015-07-21 14:46:43 +02:00
server Merge branch 'american-english' of https://github.com/CoDEmanX/ArangoDB into devel 2015-09-02 13:14:49 +02:00
.jshintrc Linting. 2015-06-16 14:54:14 +02:00
GUIDELINES.md
Makefile.files