Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/shish/shimmie2
Browse files Browse the repository at this point in the history
  • Loading branch information
shish committed Feb 20, 2018
2 parents 09e3bd3 + 419b53c commit a6d84ad
Show file tree
Hide file tree
Showing 6 changed files with 141 additions and 71 deletions.
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"ifixit/php-akismet" : "1.*",
"google/recaptcha" : "~1.1",
"dapphp/securimage" : "3.6.*",
"enshrined/svg-sanitize" : "0.8.2",

"bower-asset/jquery" : "1.12.3",
"bower-asset/jquery-timeago" : "1.5.2",
Expand Down
Loading

0 comments on commit a6d84ad

Please sign in to comment.