diff options
| author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-04-05 13:39:15 +0200 |
|---|---|---|
| committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-04-05 13:39:15 +0200 |
| commit | 355c42cb309eb1313097411067ca999b699aa620 (patch) | |
| tree | d00d1af9dceecdf114cadff924c5ba4a864fbf43 /library/cropper/tests | |
| parent | cbf4544887c7f496f2b2312727fe7bcb64a6d6c8 (diff) | |
| parent | 9b6e91086b29554fd04362f6c87ea148718e8b1c (diff) | |
| download | volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.gz volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.bz2 volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.zip | |
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
include/config.php
update.php
Diffstat (limited to 'library/cropper/tests')
16 files changed, 0 insertions, 0 deletions
diff --git a/library/cropper/tests/castle.jpg b/library/cropper/tests/castle.jpg Binary files differindex e40b7e4cb..e40b7e4cb 100755..100644 --- a/library/cropper/tests/castle.jpg +++ b/library/cropper/tests/castle.jpg diff --git a/library/cropper/tests/castleMed.jpg b/library/cropper/tests/castleMed.jpg Binary files differindex c35a6f554..c35a6f554 100755..100644 --- a/library/cropper/tests/castleMed.jpg +++ b/library/cropper/tests/castleMed.jpg diff --git a/library/cropper/tests/example-Basic.htm b/library/cropper/tests/example-Basic.htm index 391c2ecdb..391c2ecdb 100755..100644 --- a/library/cropper/tests/example-Basic.htm +++ b/library/cropper/tests/example-Basic.htm diff --git a/library/cropper/tests/example-CSS-Absolute.htm b/library/cropper/tests/example-CSS-Absolute.htm index 17e4c489d..17e4c489d 100755..100644 --- a/library/cropper/tests/example-CSS-Absolute.htm +++ b/library/cropper/tests/example-CSS-Absolute.htm diff --git a/library/cropper/tests/example-CSS-Float.htm b/library/cropper/tests/example-CSS-Float.htm index 5066553fe..5066553fe 100755..100644 --- a/library/cropper/tests/example-CSS-Float.htm +++ b/library/cropper/tests/example-CSS-Float.htm diff --git a/library/cropper/tests/example-CSS-Relative.htm b/library/cropper/tests/example-CSS-Relative.htm index 5894fe1f9..5894fe1f9 100755..100644 --- a/library/cropper/tests/example-CSS-Relative.htm +++ b/library/cropper/tests/example-CSS-Relative.htm diff --git a/library/cropper/tests/example-CoordsOnLoad.htm b/library/cropper/tests/example-CoordsOnLoad.htm index 254a23472..254a23472 100755..100644 --- a/library/cropper/tests/example-CoordsOnLoad.htm +++ b/library/cropper/tests/example-CoordsOnLoad.htm diff --git a/library/cropper/tests/example-CoordsOnLoadWithRatio.htm b/library/cropper/tests/example-CoordsOnLoadWithRatio.htm index 3a696360a..3a696360a 100755..100644 --- a/library/cropper/tests/example-CoordsOnLoadWithRatio.htm +++ b/library/cropper/tests/example-CoordsOnLoadWithRatio.htm diff --git a/library/cropper/tests/example-Dimensions.htm b/library/cropper/tests/example-Dimensions.htm index f54f99683..f54f99683 100755..100644 --- a/library/cropper/tests/example-Dimensions.htm +++ b/library/cropper/tests/example-Dimensions.htm diff --git a/library/cropper/tests/example-DynamicImage.htm b/library/cropper/tests/example-DynamicImage.htm index 898363489..898363489 100755..100644 --- a/library/cropper/tests/example-DynamicImage.htm +++ b/library/cropper/tests/example-DynamicImage.htm diff --git a/library/cropper/tests/example-FixedRatio.htm b/library/cropper/tests/example-FixedRatio.htm index 973bedda9..973bedda9 100755..100644 --- a/library/cropper/tests/example-FixedRatio.htm +++ b/library/cropper/tests/example-FixedRatio.htm diff --git a/library/cropper/tests/example-MinimumDimensions.htm b/library/cropper/tests/example-MinimumDimensions.htm index 3ae93c8e1..3ae93c8e1 100755..100644 --- a/library/cropper/tests/example-MinimumDimensions.htm +++ b/library/cropper/tests/example-MinimumDimensions.htm diff --git a/library/cropper/tests/example-MinimumWidth.htm b/library/cropper/tests/example-MinimumWidth.htm index b0576b87f..b0576b87f 100755..100644 --- a/library/cropper/tests/example-MinimumWidth.htm +++ b/library/cropper/tests/example-MinimumWidth.htm diff --git a/library/cropper/tests/example-Preview.htm b/library/cropper/tests/example-Preview.htm index 701670c91..701670c91 100755..100644 --- a/library/cropper/tests/example-Preview.htm +++ b/library/cropper/tests/example-Preview.htm diff --git a/library/cropper/tests/poppy.jpg b/library/cropper/tests/poppy.jpg Binary files differindex 1f6498584..1f6498584 100755..100644 --- a/library/cropper/tests/poppy.jpg +++ b/library/cropper/tests/poppy.jpg diff --git a/library/cropper/tests/staticHTMLStructure.htm b/library/cropper/tests/staticHTMLStructure.htm index ddb99278e..ddb99278e 100755..100644 --- a/library/cropper/tests/staticHTMLStructure.htm +++ b/library/cropper/tests/staticHTMLStructure.htm |
