diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-10-27 12:14:01 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-10-27 12:14:01 +0100 |
| commit | 41a98b654372532c389e720a0ecd08b9a9884b6d (patch) | |
| tree | aff32a956d3d12d67b94e3193cd3a8d6b8446b9b /app/javascript/flavours/glitch/actions/markers.js | |
| parent | 18c07738a6b0fa3558863dbb1610695ab6f11b74 (diff) | |
| parent | 4988ebba4e31aff5dee657836cf059b5843d9eb8 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb
Diffstat (limited to 'app/javascript/flavours/glitch/actions/markers.js')
0 files changed, 0 insertions, 0 deletions