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
..
accounts	Add confirmation modal to "Change username"	2018-04-06 09:36:22 +00:00
chat_names	[skip ci] Replace .pull-right with .float-right	2018-04-09 12:42:45 -05:00
emails	[skip ci] label-info => badge-info	2018-04-13 14:37:55 -05:00
gpg_keys	[skip ci] Replace hidden-xs	2018-04-09 16:50:40 -05:00
keys	[skip ci] Convert panel related class names to card	2018-04-10 12:11:34 -05:00
notifications	[skip ci] Replace .pull-right with .float-right	2018-04-09 12:42:45 -05:00
passwords	[skip ci] add col-sm-* for form-horizontal changes to keep layout	2018-04-12 18:16:56 -05:00
personal_access_tokens	[skip ci] input-group-btn's input-group-text should not create a new div	2018-04-12 17:55:40 -05:00
preferences	[skip ci] .help-block to .form-text.text-muted	2018-04-11 13:26:37 -05:00
two_factor_auths	Merge branch 'master' into 'bootstrap4'	2018-04-16 15:05:01 +00:00
_event_table.html.haml	[skip ci] Replace .pull-right with .float-right	2018-04-09 12:42:45 -05:00
audit_log.html.haml	removed profile webpack bundle tag	2018-02-23 17:18:24 +01:00
show.html.haml	[skip ci] .help-block to .form-text.text-muted	2018-04-11 13:26:37 -05:00