friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-22 10:54:58 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity
friendica/include
History
Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica 
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00
..
acl_selectors.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
api.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
attach.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
auth.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
bb2diaspora.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
bbcode.php Quotes with author are now having an "open/close" link 2012-03-17 12:15:59 +01:00
cache.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
config.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Contact.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
contact_selectors.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
contact_widgets.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
conversation.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
cronhooks.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
crypto.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
datetime.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
dba.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
delivery.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
diaspora.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
directory.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
email.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
EmailNotification.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
enotify.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
event.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
expire.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
fcontact.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
group.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
html2bbcode.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
html2plain.php New parameter in html2plain for plain text exports. More compatibility in API 2012-03-21 10:08:40 +01:00
items.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
message.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
msgclean.php New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements 2012-03-17 11:07:49 +01:00
nav.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
network.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
notifier.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
oauth.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
oembed.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
pgettext.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Photo.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
plugin.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
poller.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
profile_advanced.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
profile_selectors.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
profile_update.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
queue.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
queue_fn.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
quoteconvert.php New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements 2012-03-17 11:07:49 +01:00
remoteupdate.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
salmon.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Scrape.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
security.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
session.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
socgraph.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
system_unavailable.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
template_processor.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
text.php remove zrl from query string 2012-04-02 00:45:45 -07:00