beatrix e7edb4d1ee Merge pull request #87 from tootsuite/master ... merge upstream		2017-07-20 11:24:32 -04:00
..
controllers	Merge pull request #87 from tootsuite/master	2017-07-20 11:24:32 -04:00
fabricators	…
features	…
fixtures	…
helpers	…
javascript	feat(emoji): Add back title attribute (#4253)	2017-07-18 22:49:24 +02:00
lib	Correct OStatus inflection (Ostatus -> OStatus) (#4255)	2017-07-19 01:37:26 +02:00
mailers	…
models	Merge changes from upstream with the CSS reload fix	2017-07-18 18:58:47 +02:00
policies	…
presenters	…
requests	…
routing	…
services	Fix webfinger retries (#4275)	2017-07-20 01:59:07 +02:00
support	…
views	…
workers	Fix webfinger retries (#4275)	2017-07-20 01:59:07 +02:00
rails_helper.rb	…
spec_helper.rb	…