tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
5477726f50
mastodon/app/views/about
History
Thibaut Girka 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
  Conflict because we changed the number of default results to be
  configurable
- app/lib/settings/scoped_settings.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
2019-09-13 18:13:43 +02:00
..
_login.html.haml Fix duplicate HTML ids in /about (#11803) 2019-09-10 20:55:23 +02:00
_registration.html.haml Fix duplicate HTML ids in /about (#11803) 2019-09-10 20:55:23 +02:00
blocks.html.haml Add public blocks to /about/blocks (#11298) 2019-08-19 11:35:48 +02:00
more.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
show.html.haml Change full logo to use primary text color of the given theme (#10994) 2019-06-08 15:30:06 +02:00
terms.html.haml Update /terms and /about/more to use public layout (#8142) 2018-08-09 12:58:20 +02:00