b8128d356b
Conflicts: Changelog.md app/views/people/show.html.haml config/defaults.yml spec/helpers/layout_helper_spec.rb |
||
|---|---|---|
| .. | ||
| app | ||
| helpers | ||
| support | ||
| widgets | ||
| alert-spec.js | ||
| bookmarklet-spec.js | ||
| contact-list-spec.js | ||
| diaspora-spec.js | ||
| rails-spec.js | ||
| search-spec.js | ||
| validation-spec.js | ||
| view-spec.js | ||