George Vinogradov 549f0a55e8 [issue #64] Merge branch 'master' into 64-project_wiki ... Conflicts: Gemfile.lock app/models/project.rb app/models/user.rb app/views/projects/_form.html.haml config/locales/ru.yml db/schema.rb		2012-01-27 18:27:23 +04:00
..
settings	[refs #54] Add settings notifier	2012-01-11 17:58:13 +04:00
wiki_helper_spec.rb	[issue #64] Added Wiki controller and some methods in Project	2011-12-26 21:07:07 +04:00