57 commits

Author	SHA1	Message	Date
Pádraic Brady	7e30c67827	Add config.json default config option for "disable-tls" (FALSE by default)	2014-02-23 10:20:48 +00:00
Jordi Boggiano	0822683706	Fix tests	2013-06-28 20:42:06 +02:00
Jordi Boggiano	5f48d5277d	Fix tests	2013-02-21 17:45:03 +01:00
Jordi Boggiano	6d2b4354f4	Fix test	2012-12-08 21:51:52 +01:00
Jordi Boggiano	23d45f67c1	Fix config merging for arrays	2012-12-08 21:45:21 +01:00
Jordi Boggiano	ff2f9de128	Fix tests	2012-10-11 21:25:13 +02:00
Jordi Boggiano	ffecd39d33	Refactor repositories handling in config/factory/loader, fixes #828, fixes #826	2012-06-24 13:06:13 +02:00