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

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

..

lib

…

tests

…

cropper.css

…

cropper.html

…

cropper.js

…

cropper.uncompressed.js

…

licence.txt

…

marqueeHoriz.gif

…

marqueeVert.gif

…