Merge branch 'develop' of https://github.com/shish/shimmie2 into develop

This commit is contained in:
Shish 2016-07-03 11:48:16 +01:00
commit 68d58a6f11

View file

@ -29,7 +29,7 @@ check out one of the versioned branches.
# Requirements
- MySQL/MariaDB 5.1+ (with experimental support for PostgreSQL 9+ and SQLite 3)
- Stable PHP ([5.5 as of writing](https://en.wikipedia.org/wiki/PHP#Release_history))
- [Stable PHP](https://en.wikipedia.org/wiki/PHP#Release_history) (5.5 as of writing)
- GD or ImageMagick
# Installation