friendica

Files

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

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

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

cropper.css

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

cropper.html

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

cropper.js

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

cropper.uncompressed.js

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

licence.txt

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

marqueeHoriz.gif

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

marqueeVert.gif

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