Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Timothy Warren 2018-11-05 13:25:42 -05:00
commit f88f1578a8

View File

@ -121,7 +121,7 @@ final class AnimeCollection extends Collection {
->join('media', 'media.id=a.media_id', 'inner')
->order_by('media')
->order_by('title')
->group_by('a.hummingbird_id')
->group_by('a.hummingbird_id, media.type')
->get();
// Add genres associated with each item