Clement Ho 6384aedace Merge branch 'master' into 'bootstrap4' ... # Conflicts: # app/views/admin/application_settings/_signin.html.haml		2018-04-16 15:05:01 +00:00
..
_codes.html.haml	[skip ci] Convert wells to card, port info-well	2018-04-13 15:51:54 -05:00
codes.html.haml
create.html.haml
show.html.haml	Merge branch 'master' into 'bootstrap4'	2018-04-16 15:05:01 +00:00