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

fac2c3ab

Commit fac2c3ab authored 9 years ago by Mateus Rambo Strey

Downloads
- Plain Diff

fix merge

parents bc3bd73d 1c402435

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Gemfile.lock 0 additions, 2 deletions

Gemfile.lock
app/assets/javascripts/application/accessibility.js 2 additions, 0 deletions

app/assets/javascripts/application/accessibility.js
app/assets/stylesheets/application.scss 38 additions, 13 deletions

app/assets/stylesheets/application.scss
app/views/collections/index.html.erb 1 addition, 1 deletion

app/views/collections/index.html.erb
app/views/welcome/collection.html.erb 4 additions, 4 deletions

app/views/welcome/collection.html.erb
app/views/welcome/signup.html.erb 40 additions, 0 deletions

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

config/routes.rb

with 86 additions and 20 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