root 468b88e903 Fix merge conflicts with default config %!s(int64=5) %!d(string=hai) anos
..
custom.class.php ba934d486a add new class files %!s(int64=6) %!d(string=hai) anos
deluge.class.php da74a34086 add options to homepage framework classes %!s(int64=5) %!d(string=hai) anos
organizr.class.php 468b88e903 Fix merge conflicts with default config %!s(int64=5) %!d(string=hai) anos
ping.class.php ba934d486a add new class files %!s(int64=6) %!d(string=hai) anos