Merge branch 'master' into summernote
Showing
- app/controllers/admin/research/journal/articles_controller.rb 1 addition, 1 deletion...controllers/admin/research/journal/articles_controller.rb
- app/models/communication/website/menu/item.rb 11 additions, 39 deletionsapp/models/communication/website/menu/item.rb
- app/models/communication/website/menu/item/with_targets.rb 74 additions, 0 deletionsapp/models/communication/website/menu/item/with_targets.rb
- app/views/admin/research/journal/articles/static.html.erb 1 addition, 0 deletionsapp/views/admin/research/journal/articles/static.html.erb
Loading
Please register or sign in to comment