strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
friendica/view/theme/dispy
History
Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica 
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00
..
fpostit Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
icons
comment_item.tpl
communityhome.tpl update the dispy* templates 2012-04-04 23:35:07 -04:00
connect.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
contact_template.tpl
conversation.tpl
default.php
group_side.tpl
head.tpl update the dispy* templates 2012-04-04 23:35:07 -04:00
icons.png
icons.svg
jot-header.tpl update the dispy* templates 2012-04-04 23:35:07 -04:00
jot.tpl update the dispy* templates 2012-04-04 23:35:07 -04:00
login-bg.gif Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
mail_head.tpl
menu-user-pin.jpg Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
nav.tpl
nets.tpl update the dispy* templates 2012-04-04 23:35:07 -04:00
next.png
notifications.png
notifications.svg
photo-menu.jpg Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
photo_view.tpl
premium.png
prev.png
profile_vcard.tpl update the dispy* templates 2012-04-04 23:35:07 -04:00
saved_searches_aside.tpl update the dispy* templates 2012-04-04 23:35:07 -04:00
screenshot.jpg
search_item.tpl update the dispy* templates 2012-04-04 23:35:07 -04:00
star.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
style.css finish styling category tags and category input 2012-04-05 00:04:23 -04:00
tag.png
theme.php
wall_item.tpl update the dispy* templates 2012-04-04 23:35:07 -04:00
wallwall_item.tpl update the dispy* templates 2012-04-04 23:35:07 -04:00