Tobias Hößl 7f4cb9cf06 Merge branch 'master' of github.com:CatoTH/friendica-addons ... Conflicts: dav/common/calendar_rendering.fnk.php		2012-08-11 08:08:23 +00:00
..
calendar.friendica.fnk.php	Move friendica-specific parts into an own subdirectory	2012-08-04 08:46:11 +00:00
database-init.inc.php	First part of Refactoring to stay compatible with v2.0 of the VObject library	2012-08-10 21:41:17 +02:00
dav_caldav_backend_virtual_friendica.inc.php	Second part of refactoring; should be runnable again, yet not thoroughly tested	2012-08-11 08:07:19 +00:00
dav_carddav_backend_virtual_friendica.inc.php	Move friendica-specific parts into an own subdirectory	2012-08-04 08:46:11 +00:00
dav_friendica_auth.inc.php	Move friendica-specific parts into an own subdirectory	2012-08-04 08:46:11 +00:00
dav_friendica_principal.inc.php	Move friendica-specific parts into an own subdirectory	2012-08-04 08:46:11 +00:00
FriendicaACLPlugin.inc.php	Move friendica-specific parts into an own subdirectory	2012-08-04 08:46:11 +00:00
layout.fnk.php	Second part of refactoring; should be runnable again, yet not thoroughly tested	2012-08-11 08:07:19 +00:00
main.php	Second part of refactoring; should be runnable again, yet not thoroughly tested	2012-08-11 08:07:19 +00:00
wdcal.css	Move friendica-specific parts into an own subdirectory	2012-08-04 08:46:11 +00:00