projects / akkoma / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 361aa22 f891e2b)
Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
authorlain <lain@soykaf.club>
Tue, 25 Aug 2020 13:16:20 +0000 (15:16 +0200)
committerlain <lain@soykaf.club>
Tue, 25 Aug 2020 13:38:12 +0000 (15:38 +0200)
commitea2b5c07e32eba6d8a5783fb1a45b79557e1c7b2
treef2e44671aac832afbf8264c728c0e9c507ea6caftree | snapshot
parent361aa22e2862c1c914baf8257fdc8b20cbc7941dcommit | diff
parentf891e2b2f1d1daa122b9856e4b660be394d31e34commit | diff
Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
121 files changed:
.gitlab-ci.yml diff1 | diff2 | blob | history
CHANGELOG.md diff1 | diff2 | blob | history
mix.exs diff1 | diff2 | blob | history
priv/static/adminfe/app.07a1f8db.css diff1 | diff2 | blob | history
priv/static/adminfe/chunk-0171.aa11eafe.css | | blob
priv/static/adminfe/chunk-0598.d8f2b478.css | | blob
priv/static/adminfe/chunk-0778.29be65e2.css diff1 | diff2 | blob | history
priv/static/adminfe/chunk-0f09.66ca2a61.css | diff2 | blob | history
priv/static/adminfe/chunk-176e.b7aa5351.css diff1 | | blob | history
priv/static/adminfe/chunk-19e2.934ad654.css | | blob
priv/static/adminfe/chunk-28f8.0aae6427.css | | blob
priv/static/adminfe/chunk-2d97.82cbb623.css diff1 | | blob | history
priv/static/adminfe/chunk-3221.0ef79c67.css | | blob
priv/static/adminfe/chunk-39ad.ba67c97f.css | | blob
priv/static/adminfe/chunk-3ba2.63b1228d.css | | blob
priv/static/adminfe/chunk-40a4.665332db.css diff1 | | blob | history
priv/static/adminfe/chunk-4eb4.b72d16c3.css | | blob
priv/static/adminfe/chunk-565e.8c036a6e.css | | blob
priv/static/adminfe/chunk-60a9.7b5b9559.css diff1 | | blob | history
priv/static/adminfe/chunk-6198.3c37d6af.css diff1 | diff2 | blob | history
priv/static/adminfe/chunk-654e.b2e16b59.css diff1 | | blob | history
priv/static/adminfe/chunk-68ea.7633295f.css diff1 | diff2 | blob | history
priv/static/adminfe/chunk-68ea.81e11186.css | | blob
priv/static/adminfe/chunk-6e81.0e9e6d27.css diff1 | diff2 | blob | history
priv/static/adminfe/chunk-6e81.7e5babfc.css | | blob
priv/static/adminfe/chunk-6e8c.ef26acfd.css | | blob
priv/static/adminfe/chunk-7503.cc089ee4.css | | blob
priv/static/adminfe/chunk-7c6b.b529c720.css | | blob
priv/static/adminfe/chunk-9043.3f527a93.css diff1 | | blob | history
priv/static/adminfe/chunk-97e2.9f9fab0f.css | | blob
priv/static/adminfe/chunk-9a72.786caeb3.css | | blob
priv/static/adminfe/chunk-commons.a343b725.css diff1 | | blob | history
priv/static/adminfe/chunk-d892.56863b19.css | | blob
priv/static/adminfe/chunk-elementUI.40545a1f.css diff1 | diff2 | blob | history
priv/static/adminfe/chunk-libs.0380664d.css diff1 | diff2 | blob | history
priv/static/adminfe/index.html diff1 | diff2 | blob | history
priv/static/adminfe/static/fonts/element-icons.535877f.woff blob1 | blob2 | history
priv/static/adminfe/static/fonts/element-icons.732389d.ttf blob1 | blob2 | history
priv/static/adminfe/static/img/401.089007e.gif blob1 | blob2 | history
priv/static/adminfe/static/img/404.a57b6f3.png blob1 | blob2 | history
priv/static/adminfe/static/js/7zzA.e1ae1c94.js blob1 | blob2 | history
priv/static/adminfe/static/js/7zzA.e1ae1c94.js.map blob1 | blob2 | history
priv/static/adminfe/static/js/JEtC.f9ba4594.js blob1 | blob2 | history
priv/static/adminfe/static/js/JEtC.f9ba4594.js.map blob1 | blob2 | history
priv/static/adminfe/static/js/chunk-16d0.6ce78978.js blob1 | blob2 | history
priv/static/adminfe/static/js/chunk-16d0.6ce78978.js.map blob1 | blob2 | history
priv/static/adminfe/static/js/chunk-df62.6c5105a6.js blob1 | blob2 | history
priv/static/adminfe/static/js/chunk-df62.6c5105a6.js.map blob1 | blob2 | history
priv/static/adminfe/static/js/oAJy.840fb1c2.js blob1 | blob2 | history
priv/static/adminfe/static/js/oAJy.840fb1c2.js.map blob1 | blob2 | history
priv/static/index.html diff1 | diff2 | blob | history
priv/static/static/font/fontello.1598361006087.eot diff1 | diff2 | blob | history
priv/static/static/font/fontello.1598361006087.svg diff1 | diff2 | blob | history
priv/static/static/font/fontello.1598361006087.ttf diff1 | diff2 | blob | history
priv/static/static/font/fontello.1598361006087.woff diff1 | | blob | history
priv/static/static/font/fontello.1598361006087.woff2 | | blob
priv/static/static/fontello.1598361006087.css diff1 | diff2 | blob | history
priv/static/static/js/10.1c5cd5fbe554eca63dfe.js diff1 | | blob | history
priv/static/static/js/10.1c5cd5fbe554eca63dfe.js.map diff1 | | blob | history
priv/static/static/js/11.708cc2513c53879a92cc.js diff1 | | blob | history
priv/static/static/js/11.708cc2513c53879a92cc.js.map diff1 | | blob | history
priv/static/static/js/12.6619e0b2f854637e76d4.js diff1 | | blob | history
priv/static/static/js/12.6619e0b2f854637e76d4.js.map diff1 | | blob | history
priv/static/static/js/13.c843797f3e374f0e3e1a.js diff1 | | blob | history
priv/static/static/js/13.c843797f3e374f0e3e1a.js.map diff1 | | blob | history
priv/static/static/js/14.71f8caca49093a99e871.js diff1 | | blob | history
priv/static/static/js/14.71f8caca49093a99e871.js.map | | blob
priv/static/static/js/15.19866e6a366ccf982284.js diff1 | | blob | history
priv/static/static/js/15.19866e6a366ccf982284.js.map | | blob
priv/static/static/js/16.38a984effd54736f6a2c.js diff1 | | blob | history
priv/static/static/js/16.38a984effd54736f6a2c.js.map | | blob
priv/static/static/js/17.9c25507194320db2e85b.js diff1 | | blob | history
priv/static/static/js/17.9c25507194320db2e85b.js.map | | blob
priv/static/static/js/18.b29eedabe76445fe94b8.js | | blob
priv/static/static/js/18.b29eedabe76445fe94b8.js.map | | blob
priv/static/static/js/19.ed1cd5db596618779f03.js diff1 | | blob | history
priv/static/static/js/19.ed1cd5db596618779f03.js.map | | blob
priv/static/static/js/2.fb3f90b584362209a143.js diff1 | | blob | history
priv/static/static/js/2.fb3f90b584362209a143.js.map diff1 | | blob | history
priv/static/static/js/20.6d311b830d8ac672729f.js diff1 | | blob | history
priv/static/static/js/20.6d311b830d8ac672729f.js.map | | blob
priv/static/static/js/21.ce4cda179d888ca6bc2a.js diff1 | | blob | history
priv/static/static/js/21.ce4cda179d888ca6bc2a.js.map | | blob
priv/static/static/js/22.2ea93c6cc569ef0256ab.js diff1 | | blob | history
priv/static/static/js/22.2ea93c6cc569ef0256ab.js.map | | blob
priv/static/static/js/23.2c5f0fd2f2acd04592e8.js diff1 | | blob | history
priv/static/static/js/23.2c5f0fd2f2acd04592e8.js.map | | blob
priv/static/static/js/24.35eb55a657b5485f8491.js diff1 | | blob | history
priv/static/static/js/24.35eb55a657b5485f8491.js.map | | blob
priv/static/static/js/25.365514e44606a895ab50.js diff1 | | blob | history
priv/static/static/js/25.365514e44606a895ab50.js.map | | blob
priv/static/static/js/26.cf13231d524e5ca3b3e6.js diff1 | | blob | history
priv/static/static/js/26.cf13231d524e5ca3b3e6.js.map | | blob
priv/static/static/js/27.fca8d4f6e444bd14f376.js diff1 | | blob | history
priv/static/static/js/27.fca8d4f6e444bd14f376.js.map | | blob
priv/static/static/js/28.9eb3e783aeba24c84f0a.js diff1 | | blob | history
priv/static/static/js/28.9eb3e783aeba24c84f0a.js.map | | blob
priv/static/static/js/29.0b69359f0fe5c0785746.js diff1 | | blob | history
priv/static/static/js/29.0b69359f0fe5c0785746.js.map | | blob
priv/static/static/js/3.7d21accf4e5bd07e3ebf.js diff1 | | blob | history
priv/static/static/js/3.7d21accf4e5bd07e3ebf.js.map diff1 | | blob | history
priv/static/static/js/30.a9377272337674f2dd05.js diff1 | | blob | history
priv/static/static/js/30.a9377272337674f2dd05.js.map | | blob
priv/static/static/js/4.5719922a4e807145346d.js diff1 | | blob | history
priv/static/static/js/4.5719922a4e807145346d.js.map diff1 | | blob | history
priv/static/static/js/5.cf05c5ddbdbac890ae35.js diff1 | | blob | history
priv/static/static/js/5.cf05c5ddbdbac890ae35.js.map diff1 | | blob | history
priv/static/static/js/6.ecfd3302a692de148391.js diff1 | | blob | history
priv/static/static/js/6.ecfd3302a692de148391.js.map diff1 | | blob | history
priv/static/static/js/7.dd44c3d58fb9dced093d.js diff1 | | blob | history
priv/static/static/js/7.dd44c3d58fb9dced093d.js.map diff1 | | blob | history
priv/static/static/js/8.5f48d6f0cbed548baf0f.js diff1 | | blob | history
priv/static/static/js/8.5f48d6f0cbed548baf0f.js.map diff1 | | blob | history
priv/static/static/js/9.a95fcd286ba2c9050c4d.js diff1 | | blob | history
priv/static/static/js/9.a95fcd286ba2c9050c4d.js.map | | blob
priv/static/static/js/app.154c25316542278028a6.js | | blob
priv/static/static/js/app.154c25316542278028a6.js.map | | blob
priv/static/static/js/vendors~app.bc5812c087f5dbcb914d.js diff1 | | blob | history
priv/static/static/js/vendors~app.bc5812c087f5dbcb914d.js.map diff1 | | blob | history
priv/static/sw-pleroma.js diff1 | diff2 | blob | history
priv/static/sw-pleroma.js.map diff1 | diff2 | blob | history
Fork of https://akkoma.dev/AkkomaGang/akkoma.git