Eugen Rochko 2fd0473aa1 Merge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into pixiv-fix/cache_blocking		2017-04-18 01:09:57 +02:00
..
assets	Add FR locales to the onboarding modal (#1976)	2017-04-18 01:02:02 +02:00
controllers	Media controller specs (#2022)	2017-04-17 20:02:00 +02:00
helpers	Instance helper to replace site title helper (#2038)	2017-04-18 00:16:32 +02:00
lib	Fix #1972, fix #1870 - Fix special characters in XML, add tests (#1988)	2017-04-17 19:58:54 +02:00
mailers	Instance helper to replace site title helper (#2038)	2017-04-18 00:16:32 +02:00
models	Merge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into pixiv-fix/cache_blocking	2017-04-18 01:09:57 +02:00
presenters
services	Fix nil query_username (#2013)	2017-04-17 19:57:02 +02:00
validators
views	Instance helper to replace site title helper (#2038)	2017-04-18 00:16:32 +02:00
workers