friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
friendica/library/cropper/tests
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
..
castle.jpg Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
castleMed.jpg Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
example-Basic.htm Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
example-CSS-Absolute.htm Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
example-CSS-Float.htm Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
example-CSS-Relative.htm Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
example-CoordsOnLoad.htm Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
example-CoordsOnLoadWithRatio.htm Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
example-Dimensions.htm Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
example-DynamicImage.htm Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
example-FixedRatio.htm Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
example-MinimumDimensions.htm Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
example-MinimumWidth.htm Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
example-Preview.htm Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
poppy.jpg Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
staticHTMLStructure.htm Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00