shel f20f6b25b9 Merge branch 'master' into patch-2

2017-03-31 10:34:14 -04:00

..

assets

Merge branch 'master' into patch-2

2017-03-31 10:34:14 -04:00

controllers

Import feature for following/blocking lists (addresses #62, #177, #201, #454)

2017-03-30 19:42:33 +02:00

helpers

…

lib

Fix #408 - link @ names in bios

2017-03-28 14:16:08 +02:00

mailers

…

models

Import feature for following/blocking lists (addresses #62, #177, #201, #454)

2017-03-30 19:42:33 +02:00

services

…

views

Fix some views still not using counter caches

2017-03-31 14:02:07 +02:00

workers

Import feature for following/blocking lists (addresses #62, #177, #201, #454)

2017-03-30 19:42:33 +02:00