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

..

Account-Basics.md

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

andfinally.md

New user quick start.

2012-04-02 00:23:58 +01:00

Bugs-and-Issues.md

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

Connectors.md

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

Developers.md

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

Groups-and-Privacy.md

attribution issue - don't take author name from contact if available from item.

2012-02-24 20:03:13 -08:00

groupsandpages.md

New user quick start.

2012-04-02 00:23:58 +01:00

guide.md

New user quick start.

2012-04-02 00:23:58 +01:00

Home.md

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

Install.md

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

Installing-Connectors.md

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

Making-Friends.md

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

makingnewfriends.md

New user quick start.

2012-04-02 00:23:58 +01:00

Message-Flow.md

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

network.md

New user quick start.

2012-04-02 00:23:58 +01:00

Pages.md

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

peopleyouknow.md

Modified peopleyouknow to handle sites without Facebook better

2012-04-02 01:26:45 +01:00

Plugins.md

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

Profiles.md

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

Remove-Account.md

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

Settings.md

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

Tags-and-Mentions.md

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00