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

2017-04-13 16:14:11 +02:00
parent d7a4e8739a 00cc3066a2
commit e70b84b1dc
10 changed files with 95 additions and 9 deletions
--- a/app/assets/javascripts/components/locales/en.jsx
+++ b/app/assets/javascripts/components/locales/en.jsx
@@ -125,6 +125,7 @@ const en = {
  "upload_progress.label": "Uploading...",
  "video_player.toggle_sound": "Toggle sound",
  "video_player.toggle_visible": "Toggle visibility",
+  "video_player.expand": "Expand video",
 };

 export default en;