Alexander Machehin e04b2eb59b Merge branch '114-comment_notifications' into user-emails-list ... Conflicts: app/models/subscribe.rb config/locales/en.yml		2012-01-26 14:55:16 +06:00
..
devise.en.yml	[refs #114] i18n	2012-01-25 01:00:51 +06:00
devise.ru.yml	Fix nickname format check. Apply readonly nickname field. Show flash notice during registration through OpenID. Fix email read from OpenID response. Refs #1954	2011-10-13 13:19:42 +03:00
en.yml	Merge branch '114-comment_notifications' into user-emails-list	2012-01-26 14:55:16 +06:00
event_log.ru.yml	Fix bugs. Change included_repos format. Refs #65	2011-12-21 20:59:19 +02:00
ru.yml	Merge branch '114-comment_notifications' into user-emails-list	2012-01-26 14:55:16 +06:00