Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master (41c697fd) · Commits · Snow / qoto · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

qoto
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

41c697fd

Commit 41c697fd authored 8 years ago by Eugen Rochko

Downloads
- Plain Diff

Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master

parents c5afe573 9aae9ae4

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/helpers/settings_helper.rb 1 addition, 0 deletions

app/helpers/settings_helper.rb
config/application.rb 1 addition, 0 deletions

config/application.rb
config/locales/devise.it.yml 3 additions, 3 deletions

config/locales/devise.it.yml
config/locales/doorkeeper.it.yml 1 addition, 1 deletion

config/locales/doorkeeper.it.yml
config/locales/it.yml 0 additions, 0 deletions

config/locales/it.yml
config/locales/simple_form.it.yml 1 addition, 1 deletion

config/locales/simple_form.it.yml

with 7 additions and 5 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