diff options
| author | rinpatch <rinpatch@sdf.org> | 2018-12-01 18:12:27 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2018-12-01 18:12:27 +0300 |
| commit | fe2759bc9f2dad044b49f4954693ac09f9368041 (patch) | |
| tree | 59dd9c5026f433d976defa303de0d6782d435d1e /priv/static/packs/appcache | |
| parent | ba6e3eba33f16bdd2fede086d5fb5c86201cb57b (diff) | |
| parent | 8c3ff06e35e11a40cf4eb35a41a2019b7496e62c (diff) | |
| download | pleroma-fe2759bc9f2dad044b49f4954693ac09f9368041.tar.gz pleroma-fe2759bc9f2dad044b49f4954693ac09f9368041.zip | |
Attempt to resolve merge conflict
Diffstat (limited to 'priv/static/packs/appcache')
| -rw-r--r-- | priv/static/packs/appcache/manifest.appcache | 59 | ||||
| -rw-r--r-- | priv/static/packs/appcache/manifest.html | 2 |
2 files changed, 0 insertions, 61 deletions
diff --git a/priv/static/packs/appcache/manifest.appcache b/priv/static/packs/appcache/manifest.appcache deleted file mode 100644 index a2c984c77..000000000 --- a/priv/static/packs/appcache/manifest.appcache +++ /dev/null @@ -1,59 +0,0 @@ -CACHE MANIFEST -#ver:2018-8-12 18:01:32 -#plugin:4.8.4 - -CACHE: -/packs/base_polyfills.js -/packs/extra_polyfills.js -/packs/features/compose.js -/packs/modals/onboarding_modal.js -/packs/emoji_picker.js -/packs/features/notifications.js -/packs/features/account_timeline.js -/packs/features/home_timeline.js -/packs/features/public_timeline.js -/packs/features/community_timeline.js -/packs/features/direct_timeline.js -/packs/features/pinned_statuses.js -/packs/features/domain_blocks.js -/packs/features/following.js -/packs/features/followers.js -/packs/features/favourited_statuses.js -/packs/features/list_timeline.js -/packs/features/account_gallery.js -/packs/features/hashtag_timeline.js -/packs/features/status.js -/packs/features/lists.js -/packs/modals/report_modal.js -/packs/features/getting_started.js -/packs/features/follow_requests.js -/packs/features/mutes.js -/packs/features/blocks.js -/packs/features/reblogs.js -/packs/features/favourites.js -/packs/features/keyboard_shortcuts.js -/packs/modals/mute_modal.js -/packs/features/generic_not_found.js -/packs/features/list_editor.js -/packs/modals/embed_modal.js -/packs/status/media_gallery.js -/packs/containers/media_container.js -/packs/share.js -/packs/application.js -/packs/about.js -/packs/mailer.js -/packs/mastodon-light.js -/packs/contrast.js -/packs/default.js -/packs/public.js -/packs/admin.js -/packs/common.js -/packs/common.css -/packs/mailer.css -/packs/default.css -/packs/contrast.css -/packs/mastodon-light.css -/packs/manifest.json - -NETWORK: -*
\ No newline at end of file diff --git a/priv/static/packs/appcache/manifest.html b/priv/static/packs/appcache/manifest.html deleted file mode 100644 index 7e4d9c0be..000000000 --- a/priv/static/packs/appcache/manifest.html +++ /dev/null @@ -1,2 +0,0 @@ -<!doctype html> -<html manifest="manifest.appcache"></html>
\ No newline at end of file |