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

..

builder.js

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

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

controls.js

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

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

dragdrop.js

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

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

effects.js

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

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

prototype.js

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

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

scriptaculous.js

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

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

slider.js

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

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

unittest.js

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

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