diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-10-26 03:45:03 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-10-26 03:45:03 +0300 |
| commit | 0efbc126d080892214d312a3ae2549f1fc341cb6 (patch) | |
| tree | b7131288bcbc3c5b0160ad55ed4b95523ce71c12 /app/mailers | |
| parent | 46e3ad4b948dedf67245708493ee17c4429f8bf3 (diff) | |
| parent | 679c0048a8f679aad456c02e30486150bbd0d93d (diff) | |
Merge branch 'master' into 'prettify-all-the-things-4'
# Conflicts:
# app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue
Diffstat (limited to 'app/mailers')
0 files changed, 0 insertions, 0 deletions