app/models · 61c85332d2ab8545323a897724439526297c8899 · Forest Godfrey / gitlab-ce

Merge branch 'add_wiki_comments' of git://github.com/seeingidog/gitlabhq into… · 61c85332

authored Jul 25, 2012

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

61c85332

Name	Last commit	Last update
..
.gitkeep		Loading commit data...
ability.rb		Loading commit data...
commit.rb		Loading commit data...
event.rb		Loading commit data...
issue.rb		Loading commit data...
key.rb		Loading commit data...
merge_request.rb		Loading commit data...
milestone.rb		Loading commit data...
note.rb		Loading commit data...
project.rb		Loading commit data...
project_hook.rb		Loading commit data...
protected_branch.rb		Loading commit data...
snippet.rb		Loading commit data...
system_hook.rb		Loading commit data...
tree.rb		Loading commit data...
user.rb		Loading commit data...
users_project.rb		Loading commit data...
web_hook.rb		Loading commit data...
wiki.rb		Loading commit data...