]> cat aescling's git repositories - mastodon.git/commitdiff
cat aescling's git repositories / mastodon.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 356e915 e9a11dc)
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 19 Jun 2019 16:49:25 +0000 (18:49 +0200)
committerThibaut Girka <thib@sitedethib.com>
Wed, 19 Jun 2019 16:49:25 +0000 (18:49 +0200)
Conflicts:
- app/views/admin/settings/edit.html.haml
  Conflict on theme VS flavour/skin handling.
  Keep our version.


Trivial merge
source code fur Kibicat Mastodon