From 422941a606ce2da922074ee20c3d41336b8bda82 Mon Sep 17 00:00:00 2001
From: Angus McLeod <angus@mcleod.org.au>
Date: Fri, 2 Sep 2016 12:55:11 -0400
Subject: [PATCH] fix order of plugin template resolution

---
 app/assets/javascripts/discourse/ember/resolver.js.es6 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/ember/resolver.js.es6 b/app/assets/javascripts/discourse/ember/resolver.js.es6
index cdad09f8bd9..7e59a326b8e 100644
--- a/app/assets/javascripts/discourse/ember/resolver.js.es6
+++ b/app/assets/javascripts/discourse/ember/resolver.js.es6
@@ -115,8 +115,8 @@ export default Ember.DefaultResolver.extend({
   },
 
   resolveTemplate(parsedName) {
-    return this.findPluginTemplate(parsedName) ||
-           this.findPluginMobileTemplate(parsedName) ||
+    return this.findPluginMobileTemplate(parsedName) ||
+           this.findPluginTemplate(parsedName) ||
            this.findMobileTemplate(parsedName) ||
            this.findTemplate(parsedName) ||
            Ember.TEMPLATES.not_found;