Sam Rose 822534c4c4 Replace link to Resolve conflicts with buttons ... Use variables for display logic conditional checks		2016-12-28 09:40:19 -05:00
..
abuse_report_mailer
abuse_reports
admin	Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master'	2016-12-27 15:00:49 +00:00
award_emoji
ci
dashboard
devise
discussions
doorkeeper
email_rejection_mailer
emojis
errors
events
explore
groups
help
import
invites
issues
kaminari/gitlab
koding
layouts
notify
profiles
projects	Replace link to Resolve conflicts with buttons	2016-12-28 09:40:19 -05:00
repository_check_mailer
search
sent_notifications
shared
sherlock
snippets
u2f
users