mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-27 11:41:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/views/settings/preferences
History
Claire 1d1c3a808a Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream removed a setting textually adjacent to a glitch-soc-only setting.
  Removed the setting glitch-soc removed.
2024-04-06 21:01:40 +02:00
..
appearance Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream 2024-04-06 21:01:40 +02:00
notifications Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream 2024-03-11 17:29:07 +01:00
other Fix lint issue in glitch-soc-only setting form 2024-01-11 13:22:39 +01:00