Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

cleaning-portalmec
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

7904cbfc

Commit 7904cbfc authored 9 years ago by Mateus Rambo Strey

Downloads
- Plain Diff

Merge branch 'marcela'

parents 211f2c29 43625f46

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/images/icons/Copiar_Seleção.png 0 additions, 0 deletions

app/assets/images/icons/Copiar_Seleção.png
app/assets/images/icons/Download_01.png 0 additions, 0 deletions

app/assets/images/icons/Download_01.png
app/assets/images/icons/Mover_Seleção.png 0 additions, 0 deletions

app/assets/images/icons/Mover_Seleção.png
app/assets/images/icons/Remover_da_Coleção_Seleção.png 0 additions, 0 deletions

app/assets/images/icons/Remover_da_Coleção_Seleção.png
app/assets/stylesheets/application.scss 10 additions, 4 deletions

app/assets/stylesheets/application.scss
app/views/shared/application/_header.html.erb 34 additions, 0 deletions

app/views/shared/application/_header.html.erb
app/views/welcome/collection.html.erb 7 additions, 7 deletions

app/views/welcome/collection.html.erb
app/views/welcome/follow_collection.html.erb 64 additions, 0 deletions

app/views/welcome/follow_collection.html.erb
config/routes.rb 1 addition, 0 deletions

config/routes.rb

with 116 additions and 11 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment