1
0
Fork 0
Commit Graph

353 Commits

Author SHA1 Message Date
Jan Steemann d76920443d added tests and documentation for volatile collections 2013-01-07 10:55:25 +01:00
Frank Celler 0549528325 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	CHANGELOG
	Makefile.in
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/v8-vocbase.cpp
	html/admin/js/master.js
	js/actions/system/api-collection.js
	js/common/bootstrap/errors.js
	js/server/version-check.js
	lib/BasicsC/errors.dat
	lib/BasicsC/logging.c
	lib/BasicsC/voc-errors.c
	lib/BasicsC/voc-errors.h
2013-01-05 11:16:50 +01:00
Frank Celler 06e191877a added jslint target 2013-01-03 17:45:35 +01:00