strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
friendica/library/cropper
History
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 Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
tests Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
cropper.css Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
cropper.html Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
cropper.js Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
cropper.uncompressed.js Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
licence.txt Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
marqueeHoriz.gif Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
marqueeVert.gif Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00