Skip to content

Commit

Permalink
Merge branch 'master' of github.com:parallaxlogicdevelopment/encipher…
Browse files Browse the repository at this point in the history
…-admin

# Conflicts:
#	.dockerignore
#	.github/workflows/build-test.yml
#	.github/workflows/docker-release.yml
#	.github/workflows/edge_ghpage.yml
#	.github/workflows/github-release.yml
#	.gitignore
#	Dockerfile
#	README.md
#	docker-compose.yml
#	package.json
#	public/data/example.csv
#	public/robots.txt
#	src/components/ImportFeature.tsx
#	src/components/media.tsx
#	src/i18n/de.ts
#	src/i18n/en.ts
#	src/i18n/fr.ts
#	src/i18n/zh.ts
#	src/resources/destinations.tsx
#	src/synapse/authProvider.ts
#	src/synapse/dataProvider.test.ts
#	yarn.lock
  • Loading branch information
mkhemel committed Sep 9, 2024
2 parents dbcb4f9 + 13c1484 commit 2b9087e
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 213 deletions.
20 changes: 0 additions & 20 deletions .github/dependabot.yml

This file was deleted.

177 changes: 0 additions & 177 deletions LICENSE

This file was deleted.

Binary file removed public/favicon.ico
Binary file not shown.
1 change: 0 additions & 1 deletion public/images/floating-cogs.svg

This file was deleted.

15 changes: 0 additions & 15 deletions public/manifest.json

This file was deleted.

Binary file removed screenshots.jpg
Binary file not shown.

0 comments on commit 2b9087e

Please sign in to comment.