Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videol...

author Eugen Rochko <eugen@zeonfederated.com>

Thu, 13 Apr 2017 14:14:11 +0000 (16:14 +0200)

committer Eugen Rochko <eugen@zeonfederated.com>

Thu, 13 Apr 2017 14:14:11 +0000 (16:14 +0200)
author Eugen Rochko <eugen@zeonfederated.com>
Thu, 13 Apr 2017 14:14:11 +0000 (16:14 +0200)
committer Eugen Rochko <eugen@zeonfederated.com>
Thu, 13 Apr 2017 14:14:11 +0000 (16:14 +0200)
diff --cc app/assets/javascripts/components/locales/en.jsx
Simple merge
author	Eugen Rochko <eugen@zeonfederated.com>
	Thu, 13 Apr 2017 14:14:11 +0000 (16:14 +0200)
committer	Eugen Rochko <eugen@zeonfederated.com>
	Thu, 13 Apr 2017 14:14:11 +0000 (16:14 +0200)