Friendika 0bf8e418a8 Merge branch 'chriscase-master' ... Conflicts: mod/dfrn_notify.php		2011-02-17 14:05:51 -08:00
..
de	Merge branch 'chriscase-master'	2011-02-17 14:05:51 -08:00
en	Merge branch 'chriscase-master'	2011-02-17 14:05:51 -08:00
fr	Merge branch 'chriscase-master'	2011-02-17 14:05:51 -08:00
it	Merge branch 'chriscase-master'	2011-02-17 14:05:51 -08:00
theme	provide permalink for posts, include permalinks in feeds and imported from feeds	2011-02-16 02:07:11 -08:00
.htaccess
album_edit.tpl
atom_feed.tpl	compatibility: version discovery	2011-01-14 02:04:09 -08:00
atom_mail.tpl
auto_request.tpl
comment_item.tpl	ajax reload fixes	2011-02-16 21:17:49 -08:00
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_geotag.tpl
login.tpl
magicsig.tpl
mail_conv.tpl
mail_head.tpl
mail_list.tpl
photo_album.tpl
photo_edit.tpl	allow changing album name in photo edit page	2011-02-03 15:13:38 -08:00
photo_item.tpl
photo_top.tpl
photos_upload.tpl	removed java photo uploader from mainline. Photo uploaders are now plugins, but a single item upload is available by default.	2011-01-27 18:45:19 -08:00
profed_head.tpl
profile_entry.tpl
profile_vcard.tpl	personal title	2011-01-18 19:25:28 -08:00
prv_message.tpl
register.tpl
removeme.tpl	remove self	2011-02-03 03:58:47 -08:00
search_item.tpl
tag_slap.tpl
viewcontact_template.tpl
wall_fake_drop.tpl
wall_item.tpl	provide permalink for posts, include permalinks in feeds and imported from feeds	2011-02-16 02:07:11 -08:00
xrd_host.tpl
xrd_person.tpl