Michael e884090efa Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba ... Conflicts: include/uimport.php		2017-05-13 04:13:07 +00:00
..
acl_selectors.php
api.php
attach.php
auth.php
auth_ejabberd.php
bb2diaspora.php
bbcode.php
cache.php
cli_startup.php
config.php
Contact.php
contact_selectors.php
contact_widgets.php
conversation.php
create_shadowentry.php	Standards: Remove EOF closing PHP tags	2017-05-02 23:36:56 -04:00
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	Rename include/Scrape to include/probe	2017-05-07 14:45:19 -04:00
dfrn.php	Minor fixes, including overzealous replacement of app -> App	2017-05-02 23:37:30 -04:00
diaspora.php
directory.php
DirSearch.php
discover_poco.php	Add missing include/probe require for probe_url support	2017-05-07 17:08:32 -04:00
email.php
Emailer.php
enotify.php	Move App to src	2017-05-02 22:59:36 -04:00
event.php	Add missing include/probe require for probe_url support	2017-05-07 17:08:32 -04:00
expire.php
fcontact.php	Cleanup for #3010 - added spaces, thanks to @annando .	2016-12-14 09:42:36 +01:00
features.php
feed.php
files.php
follow.php
ForumManager.php
friendica_smarty.php
gprobe.php
group.php
html2bbcode.php
html2plain.php
HTTPExceptions.php
identity.php	fixed parser error, need parentheses	2017-05-12 21:02:58 +02:00
items.php
like.php
lock.php
map.php
message.php
msgclean.php
nav.php
network.php
NotificationsManager.php
notifier.php
oauth.php
oembed.php
onepoll.php
ostatus.php
pgettext.php
Photo.php
photos.php
pidfile.php
plaintext.php
plugin.php
poller.php
post_update.php
probe.php
profile_selectors.php	Revert "Coding convention applied - part 1"	2017-03-21 12:02:59 -04:00
profile_update.php
pubsubpublish.php
queue.php
queue_fn.php
quoteconvert.php
redir.php
remove_contact.php
salmon.php	Move Probe to src	2017-05-07 14:44:30 -04:00
security.php
session.php
shadowupdate.php
Smilies.php
socgraph.php
spool_post.php
system_unavailable.php
tags.php
tagupdate.php
template_processor.php
text.php
threads.php
threadupdate.php
uimport.php	Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba	2017-05-13 04:13:07 +00:00
update_gcontact.php
user.php
xml.php