Conflicts: - `CONTRIBUTING.md`: Upstream modified it while we quote upstream's within an otherwise different file. Applied upstream's changes. |
||
|---|---|---|
| .. | ||
| preferences | ||
| applications_spec.rb | ||
| exports_spec.rb | ||
| login_activities_spec.rb | ||
| migrations_spec.rb | ||
| profiles_spec.rb | ||
| verifications_spec.rb | ||