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	…
castleMed.jpg	…
example-Basic.htm	…
example-CSS-Absolute.htm	…
example-CSS-Float.htm	…
example-CSS-Relative.htm	…
example-CoordsOnLoad.htm	…
example-CoordsOnLoadWithRatio.htm	…
example-Dimensions.htm	…
example-DynamicImage.htm	…
example-FixedRatio.htm	…
example-MinimumDimensions.htm	…
example-MinimumWidth.htm	…
example-Preview.htm	…
poppy.jpg	…
staticHTMLStructure.htm	…