Dean Putney 7e7bdc6eca Fixing messed up merge with upstream master, repairing broken Tumblr auth from messed up merge | %!s(int64=10) %!d(string=hai) anos | |
---|---|---|
.. | ||
devise.en.yml | %!s(int64=10) %!d(string=hai) anos | |
en.yml | %!s(int64=11) %!d(string=hai) anos |