Michael Vogel 93143702ed Merge remote-tracking branch 'upstream/master' ... Conflicts: boot.php database.sql library/fancybox/jquery.fancybox-1.3.4.css mod/search.php update.php		2013-02-17 12:35:40 +01:00
..
_well_known.php
acctlink.php
acl.php
admin.php	Merge remote-tracking branch 'upstream/master'	2013-02-17 12:35:40 +01:00
allfriends.php
amcd.php
api.php
apps.php
attach.php
babel.php
cb.php
common.php
community.php
contactgroup.php
contacts.php
content.php
crepair.php
delegate.php
dfrn_confirm.php
dfrn_notify.php
dfrn_poll.php
dfrn_request.php
directory.php
dirfind.php
display.php
editpost.php
events.php
fbrowser.php
filer.php
filerm.php
follow.php
friendica.php
fsuggest.php
group.php
hcard.php
help.php
home.php
hostxrd.php
install.php
invite.php
item.php	Merge remote-tracking branch 'upstream/master'	2013-02-17 12:35:40 +01:00
like.php
localtime.php
lockview.php
login.php
lostpass.php
maintenance.php
manage.php
match.php
message.php
modexp.php
mood.php
msearch.php
navigation.php
network.php	Merge remote-tracking branch 'upstream/master'	2013-02-17 12:35:40 +01:00
newmember.php
nogroup.php
notes.php
notice.php
notifications.php
notify.php
oembed.php
oexchange.php
openid.php
opensearch.php
parse_url.php
photo.php	Merge remote-tracking branch 'upstream/master'	2013-02-17 12:35:40 +01:00
photos.php	Merge remote-tracking branch 'upstream/master'	2013-02-17 12:35:40 +01:00
ping.php
poco.php
poke.php
post.php
pretheme.php
probe.php
profile.php
profile_photo.php
profiles.php
profperm.php
pubsub.php
qsearch.php
randprof.php
receive.php
redir.php
register.php
regmod.php
removeme.php
rsd_xml.php
salmon.php
search.php	Merge remote-tracking branch 'upstream/master'	2013-02-17 12:35:40 +01:00
session.php
settings.php
share.php
smilies.php
starred.php
subthread.php
suggest.php
tagger.php
tagrm.php
toggle_mobile.php
uexport.php
uimport.php
update_community.php
update_display.php
update_network.php
update_notes.php
update_profile.php
view.php
viewcontacts.php
viewsrc.php
wall_attach.php
wall_upload.php
wallmessage.php
webfinger.php
xrd.php