Ondřej Hruška 7a1ca8b0df Merge remote-tracking branch 'upstream/master'		2017-08-07 22:43:52 +02:00
..
controllers	Merge remote-tracking branch 'upstream/master'	2017-08-07 22:43:52 +02:00
helpers	Fallback to site_hostname when site_title is empty (#4394)	2017-07-27 15:13:49 +02:00
javascript	Merge remote-tracking branch 'upstream/master'	2017-08-07 22:43:52 +02:00
lib	Merge remote-tracking branch 'upstream/master'	2017-08-07 22:43:52 +02:00
mailers	Set default From address in config (#3756)	2017-07-07 00:12:12 +02:00
models	Merge remote-tracking branch 'upstream/master'	2017-08-07 22:43:52 +02:00
policies
presenters	Fix JS errors and add back commit hash	2017-07-25 21:54:12 +02:00
serializers	Add unfollow modal (optional) (#4246)	2017-07-18 17:14:43 +02:00
services	Merge upstream (#111)	2017-08-01 13:20:29 -07:00
validators	Merge upstream (#111)	2017-08-01 13:20:29 -07:00
views	Merge remote-tracking branch 'upstream/master'	2017-08-07 22:43:52 +02:00
workers	Change RuboCop rules to loose (#4464)	2017-07-31 15:19:13 +02:00