Merge branch 'development' into development
dev
commit 3c2ef0293efa260e3baf2d9d80bed2fc1a53d623
2 parents 5799a3d + d0235bf
@Jimmy Angelakos Jimmy Angelakos authored on 3 May 2017
GitHub committed on 3 May 2017
Showing 12 changed files
View
.gitignore
View
Gemfile
View
Gemfile.lock
View
app/controllers/roles_controller.rb
View
app/views/plans/create.html.erb
View
app/views/user_mailer/sharing_notification.html.erb
View
config/locale/app.pot
View
config/locale/de/app.po
View
config/locale/en_GB/app.po
View
config/locale/en_US/app.po
View
config/locale/es/app.po
View
config/locale/fr/app.po