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

c45bdec7

Commit c45bdec7 authored 9 years ago by Matheus Agio Nerone

Downloads
- Plain Diff

Merge branch 'master' into file_upload

parents af40768e 0020e62e

No related branches found

No related tags found

No related merge requests found

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

app/assets/stylesheets/application.scss 8 additions, 1 deletion

app/assets/stylesheets/application.scss
app/repositories/orient_db/learning_object/relation.rb 2 additions, 1 deletion

app/repositories/orient_db/learning_object/relation.rb
app/repositories/orient_db/learning_object/relations_chain.rb 3 additions, 3 deletions

...repositories/orient_db/learning_object/relations_chain.rb
app/repositories/orient_db/relation.rb 3 additions, 1 deletion

app/repositories/orient_db/relation.rb
app/repositories/orient_db/relation_chain.rb 3 additions, 2 deletions

app/repositories/orient_db/relation_chain.rb
app/repositories/orient_db/subject/relation.rb 2 additions, 1 deletion

app/repositories/orient_db/subject/relation.rb
app/repositories/orient_db/subject/relations_chain.rb 2 additions, 2 deletions

app/repositories/orient_db/subject/relations_chain.rb
app/views/devise/registrations/new.html.erb 30 additions, 45 deletions

app/views/devise/registrations/new.html.erb
autocomplete/brazilian.txt 23136 additions, 118670 deletions

autocomplete/brazilian.txt

with 23189 additions and 118726 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