Merge branch 'master' into production

This commit is contained in:
Nick Winter 2015-03-19 10:02:52 -07:00
commit 902bee1f91

View file

@ -52,6 +52,7 @@ require("locale/ms")
require("locale/ca")
require("locale/gl")
require("locale/mk-MK")
require("locale/eo")
module.exports = class DiplomatView extends ContributeClassView
id: 'diplomat-view'