Pavel Chipiga 7308c4a0d2 Merge branch '3.2-master' into 255-search ... Refactor avatars. Fix user bugs. Remove ssh_key delete migration Conflicts: app/assets/stylesheets/design/custom.scss app/models/user.rb		2012-03-06 20:59:29 +02:00
..
edit.html.haml	Merge branch '3.2-master' into 255-search	2012-03-06 20:59:29 +02:00