me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/views/admin/trends
History
Claire 085a1197da Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components.
2023-06-10 16:22:14 +02:00
..
links Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00
statuses Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00
tags Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00