| Name | Last commit | Last update | 
|---|---|---|
| .. | ||
| user-settings.component.html | ||
| user-settings.component.scss | ||
| user-settings.component.ts | 
# Conflicts: # src/app/components/dashboard/dashboard.module.ts
| Name | Last commit | Last update | 
|---|---|---|
| .. | ||
| user-settings.component.html | Loading commit data... | |
| user-settings.component.scss | Loading commit data... | |
| user-settings.component.ts | Loading commit data... |