6ace422c29
Conflicts: Gemfile Gemfile.lock |
||
---|---|---|
.. | ||
keys | ||
notifications | ||
passwords | ||
account.html.haml | ||
design.html.haml | ||
history.html.haml | ||
show.html.haml | ||
update.js.erb | ||
update_username.js.haml |
6ace422c29
Conflicts: Gemfile Gemfile.lock |
||
---|---|---|
.. | ||
keys | ||
notifications | ||
passwords | ||
account.html.haml | ||
design.html.haml | ||
history.html.haml | ||
show.html.haml | ||
update.js.erb | ||
update_username.js.haml |