Torsten Stelling 160aa190e3 Removed some conflicts ...

Conflicts:
	fever/fever_api.php

2014-01-15 15:11:11 +01:00

..

fever_api.php

Added pull request to make more Fever API Apps useable

2014-01-15 15:07:54 +01:00

index.php

Fix for other Symlinks

2013-06-29 19:04:32 +02:00

init.php

Changed how the Fever API endpoint is generated in Fever::hook_prefs_tab().

2013-11-24 16:22:49 -05:00