randx 61c85332d2 Merge branch 'add_wiki_comments' of git://github.com/seeingidog/gitlabhq into seeingidog-add_wiki_comments ... Conflicts: app/controllers/admin/mailer_controller.rb app/controllers/notes_controller.rb		2012-07-25 21:36:30 +03:00
..
activity_observer.rb	…
issue_observer.rb	…
key_observer.rb	…
mailer_observer.rb	Merge branch 'add_wiki_comments' of git://github.com/seeingidog/gitlabhq into seeingidog-add_wiki_comments	2012-07-25 21:36:30 +03:00
project_observer.rb	…
system_hook_observer.rb	…
user_observer.rb	…