From 9b177bb7c94df6c7d3868235f75939a41acf8718 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Mon, 11 Sep 2017 15:44:42 +0000
Subject: Revert "Merge branch 'revert-f2421b2b' into 'master'"

This reverts merge request !14148
---
 app/controllers/admin/users_controller.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/controllers/admin/users_controller.rb')

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 9ec7719fabb..cbcef70e957 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -211,6 +211,7 @@ class Admin::UsersController < Admin::ApplicationController
       :provider,
       :remember_me,
       :skype,
+      :theme_id,
       :twitter,
       :username,
       :website_url
-- 
cgit v1.2.1