From a8d647b0eb280e371a73a92729a975e2a5eb1347 Mon Sep 17 00:00:00 2001 From: Koichi MATSUMOTO Date: Thu, 6 Feb 2020 22:53:42 +0900 Subject: [PATCH] Fix conflits fix conflicts --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 225057e7..30bc1d95 100644 --- a/README.md +++ b/README.md @@ -749,7 +749,7 @@ See https://github.com/n1trux/awesome-sysadmin#distributed-filesystems - [Coquelicot](https://coquelicot.potager.org/) - Coquelicot is a “one-click” file sharing web application with a focus on protecting users’ privacy. ([Source Code](https://coquelicot.potager.org/gitweb/?p=coquelicot.git)) `AGPL-3.0` `Ruby` - [Datash](https://datash.co/) - Send and Receive files directly from your browser `MIT` `Nodejs` - [DropIt](http://dropit.thal.tech/) - DropIt is a File Uploader built with nodejs, Upload, get a link, and share your files with anyone easily. ([Source Code](https://github.com/ThalKod/DropIt)) `MIT` `Nodejs` -- [droppy](https://github.com/silverwind/droppy) - droppy is a self-hosted cloud server with an interface similar to desktop file managers and has capabilities to edit files on-the-fly as well as view and playback media directly in the browser. ([Demo](http://droppy.silverwind.io/)) `BSD-2-Clause` `Nodejs` +- [droppy](https://github.com/silverwind/droppy) - droppy is a self-hosted cloud server with an interface similar to desktop file managers and has capabilities to edit files on-the-fly as well as view and playback media directly in the browser. ([Demo](https://droppy.silverwind.io/)) `BSD-2-Clause` `Nodejs` - [elixire](https://elixi.re) - Simple yet advanced screenshot uploading and link shortening service. ([Source Code](https://gitlab.com/elixire/elixire), [Clients](https://gitlab.com/elixire/elixiremanager)) `AGPL-3.0` `Python` - [fibridge](https://github.com/anderspitman/fibridge-proxy-rs) - Stream huge files out of your browser without having to upload. ([Demo](https://fbrg.xyz/)) `MIT` `Rust` - [FileShelter](https://github.com/epoupon/fileshelter) - FileShelter is a self-hosted software that allows you to easily share files over the Internet. ([Demo](http://fileshelter.demo.poupon.io/)) `GPL-3.0` `C++`