Merge branch 'master' into lp-ssh-key-permissions

2015-07-27 16:50:38 +02:00 · 2015-07-27 16:50:38 +02:00 · ff9813f200
commit ff9813f200
parent 691e02d08f db72c54bc4
1 changed files with 3 additions and 3 deletions
--- a/app/controllers/settings.coffee
+++ b/app/controllers/settings.coffee
@ -10,9 +10,9 @@ SettingsController = Ember.Controller.extend
    sshKeyDeleted: ->
      @set('model.customSshKey', null)

-    deactivate: ->
-      console.log('deactivate')
-      debugger
+    # deactivate: ->
+    #   console.log('deactivate')
+    #   debugger
    

 `export default SettingsController`