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

friendica c4221f3273 Merge branch 'master' into tres ...

Conflicts:
	include/notifier.php

2015-04-29 21:49:43 -07:00

..

dba

…

Import

…

photo

…

RedDAV

…

account.php

…

acl_selectors.php

…

activities.php

…

api.php

…

apps.php

…

attach.php

…

auth.php

…

BaseObject.php

…

bb2diaspora.php

…

bbcode.php

…

bookmarks.php

…

cache.php

…

chat.php

…

cli_startup.php

…

cli_suggest.php

…

comanche.php

add widget class to blocks again by default. we have the wrap variable now to remove the div wrapper if necessary.

2015-04-24 22:41:56 +02:00

config.php

…

contact_selectors.php

…

contact_widgets.php

…

Contact.php

…

conversation.php

Merge branch 'master' into tres

2015-04-29 21:49:43 -07:00

ConversationObject.php

…

cronhooks.php

…

crypto.php

…

datetime.php

…

deliver.php

…

diaspora.php

…

dir_fns.php

…

directory.php

…

enotify.php

…

event.php

…

expire.php

…

externals.php

…

features.php

…

follow.php

…

gprobe.php

…

group.php

…

html2bbcode.php

…

html2plain.php

…

hubloc.php

…

identity.php

…

ItemObject.php

…

ITemplateEngine.php

…

items.php

Merge branch 'master' into tres

2015-04-29 21:49:43 -07:00

js_strings.php

…

language.php

…

menu.php

…

message.php

…

nav.php

…

network.php

…

notifier.php

Merge branch 'master' into tres

2015-04-29 21:49:43 -07:00

notify.php

…

oauth.php

…

oembed.php

…

onedirsync.php

…

onepoll.php

…

page_widgets.php

…

permissions.php

…

photos.php

…

plugin.php

…

poller.php

…

probe.php

…

profile_selectors.php

…

ProtoDriver.php

…

queue_fn.php

…

queue.php

…

ratenotif.php

…

reddav.php

…

security.php

…

session.php

…

sharedwithme.php

…

smarty.php

…

socgraph.php

Merge branch 'master' into tres

2015-04-29 21:49:43 -07:00

spam.php

…

statistics_fns.php

…

system_unavailable.php

…

taxonomy.php

…

template_processor.php

…

text.php

…

widgets.php

…

zot.php

…