friendica-github/view/theme/vier/templates
Michael Vogel aed28a24f1 Merge remote-tracking branch 'upstream/master'
Conflicts:
	mod/crepair.php
2014-01-05 16:22:42 +01:00
..
comment_item.tpl missing "templates" folders 2013-04-23 07:47:57 -04:00
mail_list.tpl missing "templates" folders 2013-04-23 07:47:57 -04:00
nav.tpl Vier: A little rearrangement of the menu order. 2013-06-23 00:26:04 +02:00
profile_edlink.tpl missing "templates" folders 2013-04-23 07:47:57 -04:00
profile_vcard.tpl missing "templates" folders 2013-04-23 07:47:57 -04:00
search_item.tpl missing "templates" folders 2013-04-23 07:47:57 -04:00
threaded_conversation.tpl Merge remote-tracking branch 'upstream/master' 2014-01-05 16:22:42 +01:00
wall_thread.tpl Merge remote-tracking branch 'upstream/master' 2014-01-05 16:22:42 +01:00