Albert Yi 25f371c8c6 Merge branch 'master' of github.com:r888888888/danbooru

2018-04-12 09:53:02 -07:00

..

assets

Merge branch 'rails-5.1'

2018-04-11 11:40:36 -07:00

controllers

Merge branch 'rails-5.1'

2018-04-11 11:40:36 -07:00

helpers

Merge pull request #3541 from evazion/fix-3539

2018-03-08 16:02:02 -08:00

logical

Fix delete_all / destroy_all calls.

2018-04-11 22:33:11 -05:00

mailers

fixes #2478: Add links for easy opt-out of emails

2015-09-03 17:03:03 -07:00

models

Merge branch 'master' of github.com:r888888888/danbooru

2018-04-12 09:53:02 -07:00

presenters

Merge branch 'rails-5.1'

2018-04-11 11:40:36 -07:00

views

Merge branch 'rails-5.1'

2018-04-11 11:40:36 -07:00