mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-23 23:58:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/javascript/styles
History
Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
  Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
  Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
  Upstream added a few fields
- config/application.rb
  Upstream added a different paperclip transcoder
2019-06-24 15:02:59 +02:00
..
contrast Fix sass-lint config (#10982) 2019-06-06 18:51:46 +02:00
fonts Merge branch 'master' into glitch-soc/merge-upstream 2019-04-22 20:40:04 +02:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
mastodon-light Fix more issues in the light theme (#10996) 2019-06-08 22:32:59 +02:00
application.scss Add polls (#10111) 2019-03-03 22:18:23 +01:00
contrast.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
mailer.scss Fix sass-lint config (#10982) 2019-06-06 18:51:46 +02:00
mastodon-light.scss More polished light theme (#7620) 2018-05-25 18:36:26 +02:00
win95.scss Fix syntax errors in win95 SCSS file 2019-01-02 15:36:59 +01:00