Merge pull request #5671 from giniouxe/5662-privacy-button-text

Issue #5662 Fix text on change button
This commit is contained in:
Jonne Haß 2015-02-15 20:38:07 +01:00
commit e801c859a8
2 changed files with 4 additions and 3 deletions

View file

@ -130,6 +130,7 @@ diaspora.yml file**. The existing settings from 0.4.x and before will not work a
* Don't error out when adding a too long location to the profile [#5614](https://github.com/diaspora/diaspora/pull/5614)
* Correctly decrease unread count for conversations [#5646](https://github.com/diaspora/diaspora/pull/5646)
* Fix automatic scroll for conversations [#5646](https://github.com/diaspora/diaspora/pull/5646)
* Fix missing translation on privacy settings page [#5671](https://github.com/diaspora/diaspora/pull/5671)
## Features
* Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)

View file

@ -31,7 +31,7 @@
= t('.strip_exif')
.small-horizontal-spacer
= f.submit t('.change'), :class => 'btn'
= f.submit t('users.edit.change'), :class => 'btn'
%hr