This repository has been archived on 2024-08-19. You can view files and clone it, but cannot push or open issues or pull requests.

friendica 912be23e16 Merge branch 'master' into tres ... Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php		2015-01-29 15:09:35 -08:00
..
_well_known.php
achievements.php
acl.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
admin.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
api.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
appman.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
apps.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
attach.php
authtest.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
block.php
blocks.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
bookmarks.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
channel.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
chanview.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
chat.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
chatsvc.php
cloud.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
common.php
connect.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
connections.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
connedit.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
contactgroup.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
dav.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
delegate.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
directory.php	remote_user => remote_channel	2015-01-28 20:58:59 -08:00
dirsearch.php
display.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
editblock.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
editlayout.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
editpost.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
editwebpage.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
events.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
fbrowser.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
feed.php
filer.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
filerm.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
filestorage.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
follow.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
fsuggest.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
group.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
hcard.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
help.php	allow doc/help system to use subdirs	2015-01-27 11:48:10 -08:00
home.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
hostxrd.php
impel.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
import.php
invite.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
item.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
lang.php
layouts.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
like.php	more message restrict conversions	2015-01-29 14:51:41 -08:00
lockview.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
locs.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
login.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
lostpass.php
magic.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
mail.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
manage.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
match.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
menu.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
message.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
mitem.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
mood.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
msearch.php
network.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
new_channel.php
notes.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
notifications.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
notify.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
oembed.php
oexchange.php	remote_user => remote_channel	2015-01-28 20:58:59 -08:00
online.php
openid.php
opensearch.php
p.php
page.php	more message restrict conversions	2015-01-29 14:51:41 -08:00
parse_url.php
pdledit.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
photo.php
photos.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
ping.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
poco.php
poke.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
post.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
prep.php
pretheme.php
probe.php
profile_photo.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
profile.php	remote_user => remote_channel	2015-01-28 20:58:59 -08:00
profiles.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
profperm.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
pubsites.php
randprof.php
rbmark.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
receive.php
register.php
regmod.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
regver.php
removeaccount.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
removeme.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
rmagic.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
rpost.php	remote_user => remote_channel	2015-01-28 20:58:59 -08:00
rsd_xml.php
search_ac.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
search.php	remote_user => remote_channel	2015-01-28 20:58:59 -08:00
service_limits.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
settings.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
setup.php
share.php	remote_user => remote_channel	2015-01-28 20:58:59 -08:00
sharedwithme.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
siteinfo.php
sitelist.php	fix implicit boolean	2015-01-28 17:34:53 -08:00
smilies.php
sources.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
sslify.php
starred.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
subthread.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
suggest.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
tagger.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
tagrm.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
thing.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
toggle_mobile.php
toggle_safesearch.php
uexport.php	local_user => local_channel	2015-01-28 20:56:04 -08:00
update_channel.php
update_display.php
update_home.php
update_network.php
update_search.php
view.php
viewconnections.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
viewsrc.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
wall_attach.php
wall_upload.php
webfinger.php
webpages.php	Merge branch 'master' into tres	2015-01-29 15:09:35 -08:00
wfinger.php
xchan.php
xpoco.php
xrd.php
xref.php
zfinger.php
zotfeed.php	remote_user => remote_channel	2015-01-28 20:58:59 -08:00
zping.php	local_user => local_channel	2015-01-28 20:56:04 -08:00