Mike Greiling 0efbc126d0 Merge branch 'master' into 'prettify-all-the-things-4' ... # Conflicts: # app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue		2018-10-26 00:45:03 +00:00
..
assignees	Prettify sidebar modules	2018-10-17 00:44:22 -05:00
confidential	Prettify sidebar modules	2018-10-17 00:44:22 -05:00
lock	Prettify sidebar modules	2018-10-17 00:44:22 -05:00
participants	Prettify sidebar modules	2018-10-17 00:44:22 -05:00
subscriptions	Prettify sidebar modules	2018-10-17 00:44:22 -05:00
time_tracking	Merge branch 'master' into 'prettify-all-the-things-4'	2018-10-26 00:45:03 +00:00
todo_toggle	Prettify sidebar modules	2018-10-17 00:44:22 -05:00