Merge branch 'master' into lp-ssh-key-permissions
This commit is contained in:
commit
ff9813f200
|
@ -10,9 +10,9 @@ SettingsController = Ember.Controller.extend
|
||||||
sshKeyDeleted: ->
|
sshKeyDeleted: ->
|
||||||
@set('model.customSshKey', null)
|
@set('model.customSshKey', null)
|
||||||
|
|
||||||
deactivate: ->
|
# deactivate: ->
|
||||||
console.log('deactivate')
|
# console.log('deactivate')
|
||||||
debugger
|
# debugger
|
||||||
|
|
||||||
|
|
||||||
`export default SettingsController`
|
`export default SettingsController`
|
||||||
|
|
Loading…
Reference in New Issue
Block a user