strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
friendica/view/theme/testbubble
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
..
calendar.png 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
connect.png 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
group_drop.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
group_edit.tpl 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
groups.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
icons.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
icons.svg Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
jot-header.tpl 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
login-bg.gif Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
lrarrow.gif Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
mail_head.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
match.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
menu-user-pin.jpg Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
menu-user-pin.png 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
next.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
notifications.png 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
photo_album.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
photo_top.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
photo_view.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
photography.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
premium.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
prev.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
profile_entry.tpl 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
screenshot.jpg screenshot gallery 2012-03-25 20:08:28 -07:00
search.png 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
star.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
style.css Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
theme.php click anywhere to close notifications -> zeros and bubbles 2012-03-12 20:21:32 -07:00
user.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02: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