Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/servers/serfdom/default.nix		2014-07-01 11:25:41 +02:00
..
default.nix	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
mediawiki.nix	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
mercurial.nix	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
per-server-options.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
phabricator.nix	Phabricator, a web application, snapshot of 2014-05-12	2014-05-12 19:59:40 +02:00
tomcat-connector.nix
trac.nix	Remove use of obsolete flags	2014-04-29 10:13:21 +02:00
zabbix.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00