61c85332d2
Conflicts: app/controllers/admin/mailer_controller.rb app/controllers/notes_controller.rb |
||
---|---|---|
.. | ||
activity_observer.rb | ||
issue_observer.rb | ||
key_observer.rb | ||
mailer_observer.rb | ||
project_observer.rb | ||
system_hook_observer.rb | ||
user_observer.rb |