Merge branch 'standalone_develop' into pre_trustie_server
This commit is contained in:
commit
04b2a9b358
|
@ -67,7 +67,5 @@ json.setting do
|
||||||
json.system_notification nil
|
json.system_notification nil
|
||||||
end
|
end
|
||||||
|
|
||||||
json.sub_competitions do
|
json.sub_competitions EduSetting.get("sub_competitions")
|
||||||
json.array! EduSetting.get("sub_competitions")
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue