Merge branch 'develop' into standalone
This commit is contained in:
commit
9591c0a82a
|
@ -5,7 +5,6 @@ class SettingsController < ApplicationController
|
||||||
get_common_menu
|
get_common_menu
|
||||||
get_personal_menu
|
get_personal_menu
|
||||||
|
|
||||||
puts @com
|
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
Loading…
Reference in New Issue