jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
friendica/view/theme/facepark
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
..
border.jpg Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
comment_item.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
contact_template.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
conversation.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
ff-16.jpg Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
file.gif
friendika-16.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
group_side.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
head.jpg Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
jot.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
lock.cur Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
login-bg.gif Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
nav.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
nets.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
photo-menu.jpg Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
profile_vcard.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
saved_searches_aside.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
search_item.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
shiny.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
style.css
theme.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
unsupported facepark is unsupported ATM 2012-03-21 00:08:06 -07:00
wall_item.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
wallwall_item.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00