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
..
dashboard_controller.rb	Admin dashboard	2012-04-20 19:41:49 +03:00
hooks_controller.rb	System Hooks: rspec	2012-07-19 00:25:10 +03:00
logs_controller.rb	Admin gitolite logs. Refactored project creation. Few style fixes.	2012-07-05 21:59:37 +03:00
mailer_controller.rb	Add comments to Wiki pages	2012-07-19 20:23:55 -04:00
projects_controller.rb	Fix comments in MR. Fixed event destroy with user	2012-07-19 07:05:57 +03:00
resque_controller.rb	Refs #1013	2012-06-29 13:46:24 +02:00
team_members_controller.rb	Admin area improved	2012-02-11 19:56:18 +02:00
users_controller.rb	Finished with configs	2012-07-02 21:59:48 +03:00