Commit Graph

3 Commits

Author SHA1 Message Date
Bart Visscher c6bbccc776 Merge branch 'master' into convert-oc_config
Conflicts:
	lib/config.php
	lib/setup.php
2013-06-27 17:54:17 +02:00
Michael Gapczynski d50d663928 Style and comment fixes 2013-06-03 18:05:38 -04:00
Bart Visscher 07df94def6 Convert OC_Config to object interface 2013-05-07 19:59:46 +02:00