Merge develop to 788-separate-email-addresses

Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs

1 files changed, 1 insertions, 1 deletions

diff --git a/priv/static/packs/flavours/glitch/async/keyboard_shortcuts.js b/priv/static/packs/flavours/glitch/async/keyboard_shortcuts.js
index 8a06c80da..ad62d15d4 100644
--- a/priv/static/packs/flavours/glitch/async/keyboard_shortcuts.js
+++ b/priv/static/packs/flavours/glitch/async/keyboard_shortcuts.js
@@ -1,2 +1,2 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([[63],{666:function(t,e,d){"use strict";d.r(e),d.d(e,"default",function(){return l});var a,o,b,c=d(1),i=d(7),s=d(2),j=(d(3),d(641)),r=d(645),O=d(6),v=d(5),u=d.n(v),n=d(24),k=Object(O.f)({heading:{id:"keyboard_shortcuts.heading",defaultMessage:"Keyboard Shortcuts"}}),l=Object(O.g)((b=o=function(t){function e(){return t.apply(this,arguments)||this}return Object(i.a)(e,t),e.prototype.render=function(){var t=this.props.intl;return Object(c.a)(j.a,{icon:"question",heading:t.formatMessage(k.heading)},void 0,Object(c.a)(r.a,{}),Object(c.a)("div",{className:"keyboard-shortcuts scrollable optionally-scrollable"},void 0,Object(c.a)("table",{},void 0,Object(c.a)("thead",{},void 0,Object(c.a)("tr",{},void 0,Object(c.a)("th",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.hotkey",defaultMessage:"Hotkey"})),Object(c.a)("th",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.description",defaultMessage:"Description"})))),Object(c.a)("tbody",{},void 0,Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"r")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.reply",defaultMessage:"to reply"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"m")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.mention",defaultMessage:"to mention author"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"p")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.profile",defaultMessage:"to open author's profile"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"f")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.favourite",defaultMessage:"to favourite"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"b")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.boost",defaultMessage:"to boost"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"enter"),", ",Object(c.a)("kbd",{},void 0,"o")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.enter",defaultMessage:"to open status"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"x")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.toggle_hidden",defaultMessage:"to show/hide text behind CW"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"up"),", ",Object(c.a)("kbd",{},void 0,"k")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.up",defaultMessage:"to move up in the list"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"down"),", ",Object(c.a)("kbd",{},void 0,"j")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.down",defaultMessage:"to move down in the list"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"1"),"-",Object(c.a)("kbd",{},void 0,"9")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.column",defaultMessage:"to focus a status in one of the columns"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"n")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.compose",defaultMessage:"to focus the compose textarea"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"alt"),"+",Object(c.a)("kbd",{},void 0,"n")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.toot",defaultMessage:"to start a brand new toot"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"backspace")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.back",defaultMessage:"to navigate back"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"s")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.search",defaultMessage:"to focus search"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"esc")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.unfocus",defaultMessage:"to un-focus compose textarea/search"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"?")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.legend",defaultMessage:"to display this legend"})))))))},e}(n.a),Object(s.a)(o,"propTypes",{intl:u.a.object.isRequired,multiColumn:u.a.bool}),a=b))||a}}]);
+(window.webpackJsonp=window.webpackJsonp||[]).push([[63],{655:function(t,e,d){"use strict";d.r(e),d.d(e,"default",function(){return l});var a,o,b,c=d(0),i=d(7),s=d(1),j=(d(2),d(624)),r=d(629),O=d(6),v=d(5),u=d.n(v),n=d(25),k=Object(O.f)({heading:{id:"keyboard_shortcuts.heading",defaultMessage:"Keyboard Shortcuts"}}),l=Object(O.g)((b=o=function(t){function e(){return t.apply(this,arguments)||this}return Object(i.a)(e,t),e.prototype.render=function(){var t=this.props.intl;return Object(c.a)(j.a,{icon:"question",heading:t.formatMessage(k.heading)},void 0,Object(c.a)(r.a,{}),Object(c.a)("div",{className:"keyboard-shortcuts scrollable optionally-scrollable"},void 0,Object(c.a)("table",{},void 0,Object(c.a)("thead",{},void 0,Object(c.a)("tr",{},void 0,Object(c.a)("th",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.hotkey",defaultMessage:"Hotkey"})),Object(c.a)("th",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.description",defaultMessage:"Description"})))),Object(c.a)("tbody",{},void 0,Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"r")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.reply",defaultMessage:"to reply"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"m")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.mention",defaultMessage:"to mention author"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"p")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.profile",defaultMessage:"to open author's profile"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"f")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.favourite",defaultMessage:"to favourite"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"b")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.boost",defaultMessage:"to boost"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"enter"),", ",Object(c.a)("kbd",{},void 0,"o")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.enter",defaultMessage:"to open status"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"x")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.toggle_hidden",defaultMessage:"to show/hide text behind CW"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"up"),", ",Object(c.a)("kbd",{},void 0,"k")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.up",defaultMessage:"to move up in the list"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"down"),", ",Object(c.a)("kbd",{},void 0,"j")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.down",defaultMessage:"to move down in the list"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"1"),"-",Object(c.a)("kbd",{},void 0,"9")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.column",defaultMessage:"to focus a status in one of the columns"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"n")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.compose",defaultMessage:"to focus the compose textarea"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"alt"),"+",Object(c.a)("kbd",{},void 0,"n")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.toot",defaultMessage:"to start a brand new toot"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"backspace")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.back",defaultMessage:"to navigate back"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"s")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.search",defaultMessage:"to focus search"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"esc")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.unfocus",defaultMessage:"to un-focus compose textarea/search"}))),Object(c.a)("tr",{},void 0,Object(c.a)("td",{},void 0,Object(c.a)("kbd",{},void 0,"?")),Object(c.a)("td",{},void 0,Object(c.a)(O.b,{id:"keyboard_shortcuts.legend",defaultMessage:"to display this legend"})))))))},e}(n.a),Object(s.a)(o,"propTypes",{intl:u.a.object.isRequired,multiColumn:u.a.bool}),a=b))||a}}]);
 //# sourceMappingURL=keyboard_shortcuts.js.map
\ No newline at end of file