Tobias Diekershoff 39dd3dffe0 Merge branch '3.6-rc'		2018-03-23 08:00:37 +01:00
..
calendar.friendica.fnk.php	Merge branch '3.6-rc'	2018-03-23 08:00:37 +01:00
database-init.inc.php	Revert to stable version 3.5.4	2018-02-11 19:00:01 -05:00
dav_caldav_backend_virtual_friendica.inc.php	Merge branch '3.6-rc'	2018-03-23 08:00:37 +01:00
dav_carddav_backend_virtual_friendica.inc.php	Merge branch '3.6-rc'	2018-03-23 08:00:37 +01:00
dav_friendica_auth.inc.php	Revert to stable version 3.5.4	2018-02-11 19:00:01 -05:00
dav_friendica_principal.inc.php	Revert to stable version 3.5.4	2018-02-11 19:00:01 -05:00
FriendicaACLPlugin.inc.php	Move friendica-specific parts into an own subdirectory	2012-08-04 08:46:11 +00:00
layout.fnk.php	Merge branch '3.6-rc'	2018-03-23 08:00:37 +01:00
main.php	Merge branch '3.6-rc'	2018-03-23 08:00:37 +01:00
wdcal.css	Move friendica-specific parts into an own subdirectory	2012-08-04 08:46:11 +00:00