Friendika 6b37e6d48d Merge branch 'master' of http://github.com/erikl/friendika into erikl-master ... Conflicts: view/sv/contact_edit.tpl view/sv/strings.php		2011-03-17 14:44:06 -07:00
..
de	vorbis audio/video link buttons	2011-03-16 21:14:22 -07:00
en	vorbis audio/video link buttons	2011-03-16 21:14:22 -07:00
fr	vorbis audio/video link buttons	2011-03-16 21:14:22 -07:00
it	vorbis audio/video link buttons	2011-03-16 21:14:22 -07:00
sv	Merge branch 'master' of http://github.com/erikl/friendika into erikl-master	2011-03-17 14:44:06 -07:00
theme	vorbis audio/video link buttons	2011-03-16 21:14:22 -07:00
.htaccess
album_edit.tpl
atom_feed.tpl
atom_mail.tpl
auto_request.tpl
comment_item.tpl
contact_head.tpl
contact_template.tpl
contacts-top.tpl
crophead.tpl
custom_tinymce.css
default.php
dfrn_request.tpl
directory_item.tpl
fake_feed.tpl
follow.tpl
follow_slap.tpl
group_drop.tpl
intros.tpl
invite.tpl
jot.tpl	vorbis audio/video link buttons	2011-03-16 21:14:22 -07:00
jot_geotag.tpl
like.tpl
like_noshare.tpl
login.tpl
logout.tpl
magicsig.tpl
mail_conv.tpl
mail_head.tpl
mail_list.tpl
netfriend.tpl
photo_album.tpl
photo_edit.tpl
photo_item.tpl
photo_top.tpl
photos_upload.tpl
profed_head.tpl
profile_entry.tpl
profile_publish.tpl
profile_vcard.tpl
prv_message.tpl
register-link.tpl
register.tpl
removeme.tpl
search_item.tpl
tag_slap.tpl
viewcontact_template.tpl
wall_fake_drop.tpl
wall_item.tpl
wall_item_drop.tpl
wallwall_item.tpl
xrd_host.tpl
xrd_person.tpl