Roland Häder c0df692f5f Merge remote-tracking branch 'upstream/develop' into develop ... Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: include/diaspora.php object/Item.php		2016-12-22 11:29:56 +01:00
..
autoloader
Core
acl_selectors.php
api.php	Merge remote-tracking branch 'upstream/develop' into develop	2016-12-22 11:29:56 +01:00
attach.php
auth.php
auth_ejabberd.php	Merge pull request #3032 from annando/1612-auth-ejabber	2016-12-20 15:45:18 +01:00
autoloader.php
bb2diaspora.php
bbcode.php
cache.php
cli_startup.php
config.php
Contact.php	Merge remote-tracking branch 'upstream/develop' into develop	2016-12-22 11:29:56 +01:00
contact_selectors.php	Merge remote-tracking branch 'upstream/develop' into develop	2016-12-22 11:29:56 +01:00
contact_widgets.php
conversation.php
create_shadowentry.php
cron.php
cronhooks.php
cronjobs.php
crypto.php
datetime.php
dba.php
dba_pdo.php
dbclean.php
dbm.php
dbstructure.php
dbupdate.php
delivery.php	Merge remote-tracking branch 'upstream/develop' into develop	2016-12-22 11:29:56 +01:00
dfrn.php
diaspora.php	Merge remote-tracking branch 'upstream/develop' into develop	2016-12-22 11:29:56 +01:00
directory.php
DirSearch.php
discover_poco.php
email.php	added spaces + curly braces	2016-12-20 11:38:16 +01:00
Emailer.php
enotify.php
event.php
expire.php	Continued with coding convention:	2016-12-20 21:13:50 +01:00
fcontact.php
features.php
feed.php
files.php
follow.php	Merge remote-tracking branch 'upstream/develop' into develop	2016-12-22 11:29:56 +01:00
ForumManager.php
friendica_smarty.php
gprobe.php
group.php
html2bbcode.php
html2plain.php
HTTPExceptions.php
identity.php
items.php
like.php	Merge remote-tracking branch 'upstream/develop' into develop	2016-12-22 11:29:56 +01:00
lock.php
map.php
message.php
msgclean.php
nav.php
network.php
NotificationsManager.php
notifier.php	Merge remote-tracking branch 'upstream/develop' into develop	2016-12-22 11:29:56 +01:00
oauth.php	*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)	2016-12-19 14:27:16 +01:00
oembed.php
onepoll.php
ostatus.php
ParseUrl.php
pgettext.php
Photo.php
photos.php
pidfile.php
plaintext.php
plugin.php
poller.php
post_update.php	CSR changes, split dbclean in separate processes if worker is active	2016-10-22 10:14:41 +00:00
Probe.php
profile_selectors.php
profile_update.php
pubsubpublish.php
queue.php	Merge remote-tracking branch 'upstream/develop' into develop	2016-12-22 11:29:56 +01:00
queue_fn.php
quoteconvert.php
redir.php
remove_contact.php	Some brackets added	2016-11-28 22:18:37 +00:00
salmon.php
Scrape.php	Removed the legacy function calls, removed unused functions	2016-07-04 08:05:30 +02:00
security.php
session.php
shadowupdate.php
Smilies.php
socgraph.php
spool_post.php
system_unavailable.php	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
tags.php
tagupdate.php
template_processor.php
text.php
threads.php
threadupdate.php
uimport.php
update_gcontact.php
user.php
xml.php