jgen 3c6b8b6fe6 Merge branch 'linting' of git://github.com/shish/shimmie2 into develop ...

Conflicts:
	ext/resize/main.php

2014-04-09 15:04:18 -04:00

..

main.php

pass already fetched image object into resize(), rather than passing the ID to be re-fetched

2014-04-02 08:49:13 +01:00

theme.php

remove a bunch of dead code

2014-03-29 11:44:34 +00:00