Michael Vogel d653e27e2d Merge commit 'upstream/master' ... Conflicts: view/theme/diabook/wall_item.tpl view/theme/diabook/wallwall_item.tpl		2012-03-11 20:22:28 +01:00
..
acl_selectors.php
api.php
attach.php
auth.php
bb2diaspora.php
bbcode.php	bug #328	2012-03-10 18:52:50 -08:00
cache.php
config.php
Contact.php
contact_selectors.php
contact_widgets.php
conversation.php
cronhooks.php
crypto.php
datetime.php
dba.php
delivery.php
diaspora.php
directory.php
email.php	Mail: Removing signatures, gpg, unnecessary line breaks	2012-03-10 09:52:20 +01:00
EmailNotification.php
enotify.php
event.php
expire.php
fcontact.php
group.php
html2bbcode.php
html2plain.php
items.php
message.php
msgclean.php	Mail: Removing signatures, gpg, unnecessary line breaks	2012-03-10 09:52:20 +01:00
nav.php
network.php
notifier.php
oauth.php
oembed.php
pgettext.php
Photo.php
plugin.php
poller.php	Item cache now is one day.	2012-03-11 19:45:28 +01:00
profile_advanced.php
profile_selectors.php
profile_update.php
queue.php
queue_fn.php
quoteconvert.php
remoteupdate.php
salmon.php
Scrape.php
security.php
session.php
socgraph.php
system_unavailable.php
template_processor.php
text.php	Cache: item cache now has an autodelete of old files. The pages plugin now sets a link via redirection. So posting works.	2012-03-11 19:11:25 +01:00