tetianahogg/Alpha7 — pull request #38 by ozeron (2014-08-03 14:06:51+00:00)
Title: Профайл без конфликтов

Conflicts:
spec/models/user_spec.rb