3703 Commits

Author	SHA1	Message	Date
donald-art	242c68c26e	removed source code link	2021-01-21 14:33:39 +01:00
donald-art	e6135adfdb	Add blocky to DNS	2021-01-21 14:04:03 +01:00
mclang	05dfa3baa4	Replaces CodiMD with HedgeDoc b/c name change	2021-01-21 10:14:22 +02:00
Martijn	2742e79b9c	Fix Croodle	2021-01-14 20:26:59 +01:00
Martijn	4f2b561acf	Add Croodle	2021-01-14 17:11:10 +01:00
Nicolas Mattiocco	355c4cbb43	Add Patrowl ... Thanks !	2021-01-13 09:22:45 +01:00
niedev	a3a8707f65	Added BluetoothCommunicatorExample to Communication systems / Custom communication systems	2021-01-12 14:26:43 +01:00
Daniel Wasilew	afd4b99e97	Merge branch 'master' into patch-1	2021-01-11 08:50:46 +01:00
bigint	f7e17acb37	Remove duplicate demo link	2021-01-10 21:22:53 +05:30
nodiscc	d4f76a0242	Merge pull request #2371 from FabioLolix/patch5 ... Remove Darwin Streaming Server from Audio Streaming	2021-01-10 15:37:40 +00:00
nodiscc	a73e04f016	Merge pull request #2372 from kokomo123/patch-1 ... Removing Booked from Booking and Scheduling.	2021-01-10 15:36:57 +00:00
nodiscc	be03a1cded	your spotify: nodejs/docker	2021-01-10 15:33:30 +00:00
nodiscc	4dac946c90	Merge pull request #2367 from FabioLolix/patch4 ... Fix filebrowser description	2021-01-10 15:32:13 +00:00
nodiscc	4915da78ad	Merge pull request #2366 from FabioLolix/patch3 ... Remove Piratebox from Self-hosting Solutions	2021-01-10 15:31:47 +00:00
nodiscc	6f3a73de28	Merge pull request #2365 from FabioLolix/patch2 ... Update FreedomBox links and license	2021-01-10 15:31:02 +00:00
nodiscc	18548e815a	Merge pull request #2363 from danielquinn/patch-1 ... Update URL for Paperless	2021-01-10 15:26:26 +00:00
nodiscc	d73cd02d0c	Merge pull request #2362 from Driaan/patch-1 ... Added "Demo" link to "Volition" in section "Task management/To-do li…	2021-01-10 15:25:57 +00:00
nodiscc	fd3fbe6d3b	Merge pull request #2355 from 132ikl/patch-1 ... Update location of liteshort	2021-01-10 15:18:33 +00:00
nodiscc	981a81f053	Merge pull request #2352 from digdilem/master ... Fixed broken urls for Convos	2021-01-10 15:16:39 +00:00
nodiscc	6f8926b879	Merge pull request #2349 from mrstegeman/webthings ... Update WebThings description and links	2021-01-10 15:13:54 +00:00
nodiscc	3e22b29098	fix fireshare links ... auspham.dev/FireShare is just a demo login prompt	2021-01-10 15:07:21 +00:00
nodiscc	ce683d5c3d	Merge pull request #2329 from stephen304/patch-1 ... Add Conduit to Custom communication systems	2021-01-10 15:05:12 +00:00
kokomo123	3b0470cfe5	Removing Booking from Booking and Scheduling. ... Since there was a open issue about this, figure i would help and reduce the amount of issues I can find	2021-01-10 08:31:14 -05:00
FabioLolix	477d285d72	Remove Darwin Streaming Server from Audio Streaming ... According to wikipedia last version, 6.0.3, has been released on 10 May 2007. The source code have been uploaded on Github on 23 Jan 2016 with no further development	2021-01-09 18:16:32 +01:00
Uli	2febc884ec	add paperless-ng	2021-01-08 17:59:00 +01:00
Timothee Boussus	7c453ae337	Add YourSpotify to Personal Dashboards category	2021-01-07 20:33:34 +01:00
FabioLolix	28a53b9b1a	Fix filebrowser description ... Filebrowser can't be used as middleware anymore https://github.com/filebrowser/filebrowser/issues/1153	2021-01-07 17:19:20 +01:00
FabioLolix	24b3f131ff	Remove Piratebox from Self-hosting Solutions ... The project is being discontinued https://forum.piratebox.cc/read.php?9,23070	2021-01-07 16:31:47 +01:00
FabioLolix	38b59123a1	Update FreedomBox links and license	2021-01-07 16:16:43 +01:00
Daniel Quinn	1dce555e0a	Update URL for Paperless ... I moved the project into its own organisation years ago so the community could take over. The old URL still redirects, but I don't know how long GitHub will keep that up.	2021-01-05 21:00:23 +00:00
nodiscc	1ca233caee	Merge pull request #2344 from tacerus/master ... Firefox Accounts Server	2021-01-05 20:40:52 +00:00
nodiscc	4e7be58de0	Merge pull request #2339 from PhiTux/patch-1 ... Add DailyTxT to Misc/Other	2021-01-05 20:40:26 +00:00
nodiscc	6e13c28232	Merge pull request #2316 from Webreaper/patch-1 ... Add Damselfly to Photo and Video Galleries	2021-01-05 20:40:18 +00:00
nodiscc	c08791e38b	Merge pull request #2317 from bminusl/master ... Add IHateToBudget to Money, Budgeting and Management	2021-01-05 20:39:59 +00:00
Driaan	87b726bc82	Added "Demo" link to "Volition" in section "Task management/To-do lists"	2021-01-03 12:35:34 +02:00
132ikl	2e00e1b4e9	Update location of liteshort	2020-12-29 19:03:04 -05:00
Daniel Wasilew	c7705dc53b	removed double space	2020-12-29 05:27:44 +01:00
Daniel Wasilew	3a6b898c15	Update README.md	2020-12-28 12:55:38 +01:00
Daniel Wasilew	92c595b352	add paper{s}pace to Document Management	2020-12-28 12:49:57 +01:00
digdilem	2fa7877b46	Update README.md ... FIxed broken urls for Convos	2020-12-25 22:37:14 +00:00
bigint	5862de01ad	Add Taskord	2020-12-24 15:48:30 +05:30
Erik Rigtorp	6d69514a34	Add link to Olaris video streaming server	2020-12-23 11:52:02 -08:00
Michael Stegeman	ebfd9eb1f6	Update WebThings description and links ... Mozilla has spun out WebThings into a community-owned project. See: https://hacks.mozilla.org/2020/12/flying-the-nest-webthings-gateway-1-0/	2020-12-21 22:28:22 -09:00
Kovah	f4f9de686c	Add LinkAce to Bookmarks and Link Sharing	2020-12-21 11:46:21 +01:00
Pierre Kil	20e5f4cffe	Update README.md ... Added OpenRemote new open source IoT Platform	2020-12-16 21:00:25 +01:00
Koichi MATSUMOTO	bdc4e1e450	Remove BlackUpload ... Remove BlackUpload	2020-12-17 03:36:18 +09:00
Bert Van de Poel	bf4f02d8d6	Add Tabby to Money, Budgeting and Management	2020-12-16 19:35:51 +01:00
Koichi MATSUMOTO	faeaf97eec	remove the technical stack description ... remove the technical stack description	2020-12-17 03:34:14 +09:00
nodiscc	0cdbe4c738	Merge pull request #2335 from mightypanders/patch-2 ... Update Wiki link for Mumble to https	2020-12-16 18:04:41 +00:00
nodiscc	fe0d69f505	update conduit description (powered by Matrix)	2020-12-16 18:03:57 +00:00
nodiscc	15b0aba73c	Merge pull request #2333 from maxhollmann/patch-1 ... Add Podify to Multimedia Streaming	2020-12-16 18:02:44 +00:00
nodiscc	f6a447afd1	Merge pull request #2323 from hooopo/patch-3 ... add Hackershare to Bookmarks and Link Sharing	2020-12-16 18:02:16 +00:00
tacerus	3d4c48f27d	Changed Firefox Accounts Server description ... Made the description more uniform and clear.	2020-12-15 01:13:30 +00:00
tacerus	fabc1c5fa8	Fixed broken Firefox Accounts Server link ... The old documentation link was deprecated / serving a 404 page.	2020-12-15 01:09:18 +00:00
Koichi MATSUMOTO	188393954c	fix the beginning of words to small case. ... fix the beginning of words to small case.	2020-12-13 01:30:43 +09:00
Koichi MATSUMOTO	7eba6b7185	fix typo ... fix typo	2020-12-13 00:39:00 +09:00
Koichi MATSUMOTO	9d448b117f	Add BlackUpload and FireShare ... Add `BlackUpload` and `FireShare`	2020-12-13 00:02:31 +09:00
PhiTux	5280caae75	Add DailyTxT to Misc/Other ... Thanks for your work on this awesome never ending list! I use DailyTxT since many years now. This new rewrite was now tested for several days (no severe bugs found) and now I finally published it. Did not really found a better category than Misc/Other... To ensure your PR is dealt with swiftly please check the following: - [x] Your submissions are formatted according to the following requirements (`Demo` and `Clients` are optional, don't add a duplicate `Source code` link if it is the same as the main link): ``- [Name](http://homepage/) - Short description, less than 250 characters. ([Demo](http://url.to/demo), [Source Code](http://url.of/source/code), [Clients](https://url.to/list/of/related/clients-or-apps)) `License` `Language` `` - [x] If your additions depend on proprietary services outside the user's control, they must be marked `⚠`. ``- [Name](http://homepage/) `⚠` - Short description, less than 250 characters. ([Demo](http://url.to/demo), [Source Code](http://url.of/source/code), [Clients](https://url.to/list/of/related/clients-or-apps)) `License` `Language` `` - [x] Additions that are not [Free software](https://en.wikipedia.org/wiki/Free_software) must be added to `non-free.md` and marked `⊘ Proprietary`: ``- [Name](http://homepage/) `⊘ Proprietary` - Short description, less than 250 characters. ([Demo](http://url.to/demo), [Source Code](http://url.of/source/code), [Clients](https://url.to/list/of/related/clients-or-apps)) `Language` `` - [x] Your additions are ordered alphabetically. - [x] Your additions are not already listed at [awesome-sysadmin](https://github.com/n1trux/awesome-sysadmin) (IT infrastructure management), [awesome-analytics](https://github.com/onurakpolat/awesome-analytics) (analytics), [staticgen.com](https://www.staticgen.com/) or [staticsitegenerators.net](https://staticsitegenerators.net/) (static site generators). - [x] The `Language` tag is the main server-side requirement for the software - don't include frameworks/specifc dialects. - [x] Any licenses you have added are in our [list of licenses](https://github.com/awesome-selfhosted/awesome-selfhosted/blob/master/README.md#list-of-licenses). - [x] You have searched the repository for any relevant [issues](https://github.com/awesome-selfhosted/awesome-selfhosted/issues) or [PRs](https://github.com/awesome-selfhosted/awesome-selfhosted/pulls), including closed ones. - [x] Any category you are creating has the minimum requirement of 3 items. If not, your addition may be inserted into `Misc/Other`. - [x] Any software project you are adding to the list is actively maintained. - [x] The pull request title is "Add aaa to bbb" for adding software aaa to section bbb. Do not call it "Update README.md".	2020-12-11 18:46:37 +01:00
Mark Otway	e97ce8287d	Refer to damselfly.info domain ... Best to use the domain now the site is up and running.	2020-12-11 12:11:13 +00:00
mightypanders	3195ab8606	set Wiki link for Mumble to https ... http link leads to a 404	2020-12-07 12:31:27 +01:00
Stephen Smith	464cab3d04	Add Conduit to Custom communication systems	2020-12-06 12:53:46 -05:00
nodiscc	0f84e0b4e4	Merge pull request #2328 from SpekBin/master ... Fixing link for "Matrix Console Web"	2020-12-06 10:22:21 +00:00
nodiscc	ea989ebaf4	Merge pull request #2326 from mzch/master ... Move uPste to Pste	2020-12-06 10:20:12 +00:00
nodiscc	5dad6da2ef	Merge pull request #2288 from mindcollapse/patch-1 ... Add MalwareMultiScan to Misc/Other	2020-12-06 10:13:57 +00:00
Max Hollmann	45cb948e4a	Add Podify to Multimedia Streaming ... Not totally happy with the category, but it's the one that comes closest IMO.	2020-12-06 00:20:26 +01:00
Mark Otway	7e252cb7e4	Use direct link to Github repo ... Instead of a domain that redirects.	2020-12-04 13:23:33 +00:00
th3r00t	7c5f871116	Update README.md ... Added pyShelf to Ebook software. pyShelf is still in development, however I feel it's core set of features is complete enough for most daily use. Thus far pyshelf indexes and hosts mobi, & epubs. I am currently working on PDF integration.	2020-12-02 12:45:06 -05:00
Peter Thaleikis	b7e22d38a0	Fixing link for "Matrix Console Web"	2020-12-01 21:51:23 +04:00
Pete Matsyburka	5db37fc8e9	Add SiteInspector to Automation	2020-11-30 22:48:15 +02:00
Koichi MATSUMOTO	b936debff3	fix language and license ... fix language and license	2020-11-30 22:13:57 +09:00
Koichi MATSUMOTO	5772f79a8b	Move uPste to Pste ... uPste has no longer been maintained and its repository is archived. Instead Pste is developed now.	2020-11-30 22:10:12 +09:00
Hooopo	a255ca8159	add Hackershare to Bookmarks and Link Sharing	2020-11-29 00:56:19 +08:00
Bryton Lacquement	0ab57eeb6f	fixup! Add IHateToBudget to Money, Budgeting and Management ... This fixes commit 13318d5263.	2020-11-28 13:39:59 +01:00
nodiscc	f08deb0ed5	Merge pull request #2306 from visika/patch-1 ... Add Gancio to Polls and Events	2020-11-28 12:03:10 +00:00
nodiscc	c204429706	Merge pull request #2322 from mzch/master ... Add Tinode	2020-11-28 12:00:18 +00:00
nodiscc	ae77a262b8	gancio: Nodejs (npm/node is required)	2020-11-28 11:57:11 +00:00
nodiscc	9dbaa419d1	Merge pull request #2304 from chr15m/master ... Add Slingcode to IDEs.	2020-11-28 11:47:40 +00:00
nodiscc	1f25868656	Merge pull request #2301 from akhilrex/patch-1 ... Added Podgrab to Automation	2020-11-28 11:45:47 +00:00
nodiscc	5b0f3cbb68	Merge pull request #2290 from slurdge/patch-1 ... Add goeland to RSS/Atom automation	2020-11-28 11:45:25 +00:00
nodiscc	671dcfe46a	fix Tinode Client -> Clients	2020-11-28 11:42:22 +00:00
Koichi MATSUMOTO	c2c1d424de	Add Tinode ... Add Tinode to Custom communication systems.	2020-11-28 20:37:34 +09:00
nodiscc	c3be7b0034	Merge pull request #2312 from Norem80/master ... Removed Xbox from Jellyfin client list.	2020-11-28 11:36:35 +00:00
nodiscc	5fd9a110b1	Merge pull request #2310 from razorinc/sharetribe-to-nonfree ... Moving Sharetribe to non-free.md Fix #2283	2020-11-28 11:32:37 +00:00
nodiscc	3e42ec35e1	fix slingcode syntax	2020-11-28 11:18:45 +00:00
nodiscc	85af8f3c66	Merge pull request #2299 from diced/master ... Add Zipline	2020-11-28 11:17:43 +00:00
nodiscc	149b9518ed	Merge pull request #2296 from rhrn/patch-1 ... Add filebrowser (Web based file managers)	2020-11-28 11:17:15 +00:00
nodiscc	f594f35ede	Merge pull request #2284 from Aimeedeer/patch-2 ... Add oddmuse to wiki	2020-11-28 11:15:56 +00:00
Bryton Lacquement	13318d5263	Add IHateToBudget to Money, Budgeting and Management	2020-11-25 16:44:51 +01:00
Mark Otway	566692292a	Add Damselfly	2020-11-23 23:11:04 +00:00
Nikodem Deja	c4ff0fc106	Removed Xbox from Jellyfin client list.	2020-11-19 20:19:03 +01:00
Mariano Mollo	369211a06d	Remove framework	2020-11-12 12:54:11 +01:00
Mariano Mollo	44dfa9dc96	Add Gancio	2020-11-12 12:49:33 +01:00
Francesco Vollero	2627ce3746	Moving Sharetribe to non-free Fix #2283 ... - Deleted Sharetribe from README.md - Added Sharetribe to non-free.md	2020-11-10 23:19:46 +01:00
Chris McCormick	d5a12bb8fc	Add Slingcode to IDEs.	2020-11-10 18:20:43 +08:00
Akhil Gupta	19574179ee	updated language to Docker/Go	2020-11-10 06:07:17 +05:30
slurdge	40a43bf997	Remove extra white space at end of line	2020-11-09 19:58:38 +01:00
nodiscc	4ee064641e	Merge pull request #2298 from kokomo123/patch-2 ... Remove Droppy and Kandan from Awesome-selfhosted list	2020-11-09 17:07:44 +00:00
nodiscc	1aee88a5aa	Merge pull request #2297 from SpeksForks/master ... Fixing canvas link	2020-11-09 17:04:09 +00:00
Akhil Gupta	a677a6d51e	Added Podgrab - podcast manager and downloader	2020-11-06 19:03:04 +05:30
dicedtomato	26e783984c	Change dicedtomatoreal to diced (username change)	2020-11-05 09:16:57 -08:00
dicedtomato	98354b51d5	remove extra space	2020-11-02 21:32:49 -08:00
dicedtomato	d8141f4b74	Add zipline to list of Single-click/drag-n-drop uploaders	2020-11-02 21:28:34 -08:00
kokomo123	fcef5bb633	Clean up the list a little bit. ... Happy to help with cleaning up the awesome-selfhosted list, closing issue and making sure its up to date sometimes.	2020-11-02 17:57:56 -05:00
Peter Thaleikis	6dd2f11c7f	Fixing canvas link	2020-11-02 11:16:47 +04:00
Roman Nesterov	fd53d3431a	Update README.md	2020-11-01 23:34:24 +03:00
Nic Samuelson	9b9776412b	fixed a couple very minor typos	2020-10-31 10:18:10 -05:00
Robin Schneider	b489602668	Add DebOps to Complete solutions	2020-10-31 12:22:00 +01:00
nodiscc	994856cc16	Merge pull request #2279 from kokomo123/patch-1 ... Add Send to Peer-To-Peer Filesharing.	2020-10-30 14:50:47 +00:00
nodiscc	18082ed892	Merge pull request #2280 from awesome-selfhosted/fixformatting ... Fix category and note formatting.	2020-10-30 14:50:20 +00:00
nodiscc	a1460f3a87	Merge pull request #2281 from d3wy/patch-3 ... Added demo link for minimalist-web-notepad	2020-10-30 14:49:26 +00:00
nodiscc	9facd7b186	Merge pull request #2274 from Pe46dro/master ... Add Isotope, HyperKitty, Postorius, LBRY	2020-10-30 14:40:57 +00:00
nodiscc	01ad8b388a	Merge pull request #2286 from maauer/patch-2 ... Add Mobilizon to Polls and Events	2020-10-30 14:34:59 +00:00
nodiscc	0fa2ec3e18	Merge pull request #2276 from Bubka/patch-1 ... Add 2FAuth to Misc/Other	2020-10-30 14:34:20 +00:00
slurdge	8a92ac59d0	Add goeland to RSS/Atom automation ... This brings [Goeland](https://github.com/slurdge/goeland) as a (simpler) alternative to RSS2EMail	2020-10-30 14:29:40 +01:00
Volodymyr Smirnov	d16f14432b	Add MalwareMultiScan to Misc/Other	2020-10-30 08:35:05 +02:00
em	2402e10f35	Add Mobilizon	2020-10-28 15:12:31 -04:00
Anders Pitman	4afb5f1344	Remove demo site for fibridge ... I'm not running it anymore.	2020-10-27 17:10:31 -06:00
Pietro Marangon	7492bc6ef8	Update README.md	2020-10-25 15:20:37 +01:00
Aimee	1ebd924975	add oddmuse wiki	2020-10-24 22:57:14 -05:00
d3wy	d8275cc796	Added demo link for minimalist-web-notepad ... After reviewing minimalist-web-notepad's git project a demo was identified, I have added this link to it's entry	2020-10-20 10:57:38 +10:00
Nate	242d0d8f68	Fix category and note formatting.	2020-10-18 18:04:06 +09:00
kokomo123	7669f1309c	Fix up it for good.	2020-10-17 10:47:15 -04:00
nodiscc	8ed8d8a7d5	Merge pull request #2278 from SpeksForks/master ... Improving readability	2020-10-17 14:21:02 +00:00
nodiscc	66048208db	Merge pull request #2262 from nwerker/master ... Added StackStorm to Automation Section	2020-10-17 14:08:19 +00:00
kokomo123	6c875c38a4	Last Commit ... Finally fixed up everything. Sorry about that.	2020-10-16 19:29:31 -04:00
kokomo123	34dab10a53	Fix up android client and revert changes ... Fixed up the android client by adding [Clients] instead of actually making a separate line. Sorry	2020-10-16 19:05:39 -04:00
kokomo123	c04b173f34	Edited requested changes / add android client	2020-10-16 18:44:34 -04:00
kokomo123	a6d7a92d8b	Add Send to Peer-To-Peer Filesharing. ... This is basically a fork of Mozilla's Firefox Send thats now discontinued/archived, just without the branding and everything. It was made as a community effort to keep Firefox Send alive in a way. So you can legally self-host it. A friend recommended this to me, so i felt like it's appropriate to add it back into Awesome-Selfhosted. Hope this is acceptable.	2020-10-16 13:18:46 -04:00
Peter Thaleikis	f41a2ed123	professionnal -> professional	2020-10-14 12:27:57 +04:00
Peter Thaleikis	13bd5b6bc0	Improving readability	2020-10-14 12:24:54 +04:00
Bubka	c22e5b2069	Add 2FAuth to Misc/Other	2020-10-13 22:13:47 +02:00
Pietro Marangon	ee9a577b9d	Update README.md ... Add Isotope Mail client #2177 Add HyperKitty and Postorius #2145 Add LBRY #2111	2020-10-11 15:58:40 +02:00
n8225	69ff2ae421	Merge pull request #2267 from d3wy/patch-2 ... Updated Goodwork Demo	2020-10-11 13:51:07 +09:00
n8225	431879e264	Merge pull request #2263 from gersilex/patch-1 ... Add "Demo" Link to "openHAB" in section "IoT"	2020-10-11 13:50:15 +09:00
d3wy	b614852e05	Updated Goodwork ... Changed Goodwork to their home page, added source code link to github project.	2020-10-11 13:37:55 +10:00
Leroy Förster	cdcf0e2459	Update license of openHAB in section IoT	2020-10-11 05:05:27 +02:00
n8225	350216e7e6	Merge pull request #2269 from orandin/patch-2 ... Adding uTask to Automation	2020-10-11 10:31:13 +09:00
n8225	f8d9119acb	Merge pull request #2268 from AlexFullmoon/patch-2 ... Add Sshwifty to Gateways and terminal sharing	2020-10-11 10:30:05 +09:00
n8225	8dffd01371	Merge pull request #2261 from alexta69/patch-1 ... Add MeTube to Automation	2020-10-11 10:17:27 +09:00
n8225	a03258eef1	Merge pull request #2271 from awesome-selfhosted/fix-gnusocial ... update GNU social source code link	2020-10-11 10:11:17 +09:00
nodiscc	5f72a17a24	remove miniproxy ... Deprecated/no longer maintained since 2020.04.26 fixes https://github.com/awesome-selfhosted/awesome-selfhosted/issues/2084	2020-10-10 21:23:20 +02:00
nodiscc	87ae6dea37	update GNU social source code link ... fixes https://github.com/awesome-selfhosted/awesome-selfhosted/issues/2106	2020-10-10 21:21:03 +02:00
nodiscc	b3129dc887	update link to unmaintained projects curation/URL cleanup issue	2020-10-10 13:23:06 +00:00
nodiscc	7785192df5	fix Sshwifty language/platform	2020-10-10 13:05:21 +00:00
Simon Delberghe	e4cee55492	Adding uTask to Automation	2020-10-10 12:32:00 +02:00
AlexFullmoon	ddb4f48c5b	Update README.md	2020-10-09 13:54:18 +03:00
d3wy	7470111626	Updated Goodwork Demo ... Goodwork demo was dead as identified in Issue2266, updated with link to github project page which provides a further link to a demo and credentials to access it. Similiarly updated Ethercalc's url as it has been updated (source for new url was github project)	2020-10-09 15:41:56 +10:00
nodiscc	ae064d820b	fix Jupyter license (no space)	2020-10-08 22:12:43 +02:00
nodiscc	f7f8c55db7	update the travis CI links check badge to point to master branch	2020-10-08 17:20:33 +00:00
nodiscc	512ae7f897	Merge branch 'master' into block6	2020-10-08 16:49:04 +00:00