Hypolite Petovan e8e1f9253d Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links ...

# Conflicts:
#	include/follow.php

2016-12-20 12:50:36 -05:00

..

BaseObject.php

Some rewrites:

2016-12-13 10:16:36 +01:00

Conversation.php

Some rewrites:

2016-12-13 10:16:36 +01:00

Item.php

Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links

2016-12-20 12:50:36 -05:00

TemplateEngine.php

template engine rework

2013-04-23 03:27:52 -04:00