Conflicts: app/assets/stylesheets/generic/nav_sidebar.scss
Attach a file by drag & drop or click to upload
