Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec

.gitignore

Gemfile.lock

app/assets/images/fnde.png

app/assets/images/icons/downloadred.png

app/assets/images/icons/foldergreen.png

app/assets/images/icons/signup.png

app/assets/images/logo_brasil.png

app/assets/images/logo_ministerio.png

app/assets/javascripts/application.js

app/assets/javascripts/application/accessibility.js

app/assets/javascripts/application/search.js

app/assets/stylesheets/application.scss

app/assets/stylesheets/application/learning_objects.scss

app/assets/stylesheets/application/search.scss

app/views/collections/index.html.erb

app/views/devise/sessions/new.html.erb

app/views/learning_objects/show.html.erb

app/views/search/index.html.erb

app/views/shared/application/_footer.html.erb

app/views/welcome/account.html.erb