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

30905cce

Commit 30905cce authored 9 years ago by Mateus Rambo Strey

Downloads
- Plain Diff

Merge branch 'change_texts' into 'master'

Change faq text, add logos



See merge request !44

parents 7c73bd16 bcff9664

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/images/logo_brasil.png 0 additions, 0 deletions

app/assets/images/logo_brasil.png
app/assets/images/logo_c3.png 0 additions, 0 deletions

app/assets/images/logo_c3.png
app/assets/images/logo_fnde.jpg 0 additions, 0 deletions

app/assets/images/logo_fnde.jpg
app/assets/images/logo_ufpr.jpg 0 additions, 0 deletions

app/assets/images/logo_ufpr.jpg
app/views/shared/application/_footer.html.erb 15 additions, 18 deletions

app/views/shared/application/_footer.html.erb
app/views/welcome/contact.html.erb 1 addition, 1 deletion

app/views/welcome/contact.html.erb
app/views/welcome/faq.html.erb 25 additions, 6 deletions

app/views/welcome/faq.html.erb

with 41 additions and 25 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