Annabel Dunstone Gray 95685cafc9 Fix alignment of MR conflict resolution		2018-05-23 11:07:43 -07:00
..
components
_commit_stats.html.haml	Update copy; add monospace font to branch names	2018-05-21 11:36:54 -07:00
_file_actions.html.haml
_submit_form.html.haml	Fix alignment of MR conflict resolution	2018-05-23 11:07:43 -07:00
show.html.haml	remove merge_conflicts bundle in favor of pages directory entry point	2018-02-27 16:51:12 -06:00