Jan Steemann a9c2dcc83d Merge branch '1.4' of https://github.com/triAGENS/ArangoDB into 1.4 ... Conflicts: CHANGELOG		2014-01-10 16:43:18 +01:00
..
actions	ported web interface changes from devel to 1.4	2013-12-18 16:22:16 +01:00
apps/system/aardvark	Updated the WebFrontend Font, this version is now at least rendered on Windows/Chrome+FF	2014-01-10 16:00:21 +01:00
client	ported web interface changes from devel to 1.4	2013-12-18 16:22:16 +01:00
common	Merge pull request #723 from pluma/npm-default-package-main	2014-01-09 23:07:38 +01:00
node	added coffee-script	2013-04-21 22:57:19 +02:00
npm	added sinon, upgraded underscore and coffe-script	2013-09-20 17:46:52 +02:00
server	defer evaluation of subqueries	2014-01-10 16:42:46 +01:00
GUIDELINES.md	fixed typos	2013-01-18 17:10:24 +01:00
Makefile.files	use per-database directories for Foxx apps	2013-09-30 10:57:29 +02:00