rabuzarus 649578ae33 Merge develop-new into event-attendance-new ... Conflicts: include/conversation.php		2015-10-11 19:39:55 +02:00
..
ch_connectors.tpl	The right side now contains much stuff from diabook - but completely reworked.	2015-10-03 12:55:55 +02:00
ch_directory_item.tpl
ch_helpers.tpl	The right side now contains much stuff from diabook - but completely reworked.	2015-10-03 12:55:55 +02:00
comment_item.tpl
communityhome.tpl	The right side now contains much stuff from diabook - but completely reworked.	2015-10-03 12:55:55 +02:00
contact_template.tpl
mail_list.tpl
nav.tpl
photo_item.tpl
photo_view.tpl
profile_advanced.tpl
profile_edit.tpl
profile_edlink.tpl
profile_vcard.tpl
search_item.tpl
theme_admin_settings.tpl	The right side now contains much stuff from diabook - but completely reworked.	2015-10-03 12:55:55 +02:00
theme_settings.tpl	The right side now contains much stuff from diabook - but completely reworked.	2015-10-03 12:55:55 +02:00
threaded_conversation.tpl
wall_item_tag.tpl
wall_thread.tpl