mollusk/jb-posts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
mollusk 2019-06-10 06:37:47 -07:00
commit 9af0bb3a1c
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CL-diaspora.md
View File

@ -1,6 +1,6 @@
[![lan](https://images.fireside.fm/podcasts/images/b/bcfa14da-33ad-4749-b1a9-4b668e7aa8c7/cover_small.jpg)](https://chooselinux.show) [![lan](https://images.fireside.fm/podcasts/images/b/bcfa14da-33ad-4749-b1a9-4b668e7aa8c7/cover_small.jpg)](https://chooselinux.show)
## [Episode 09](https://chooselinux.show/9) - 05/30/2019 ## [Episode 11](https://chooselinux.show/11) - 06/13/2019
### Description: ### Description:

6
CL-mastodon.md
View File

@ -1,8 +1,8 @@
Choose Linux 09 Choose Linux 11
Date: 05/16/2019 Date: 06/13/2019
Desc: Desc:
Page: https://chooselinux.show/9 Page: https://chooselinux.show/11
DL: DL:
Tags: #linux #chooselinux #podcasts #tech #technews #foss Tags: #linux #chooselinux #podcasts #tech #technews #foss

8
lan-diaspora.md
View File

@ -1,6 +1,14 @@
[![lan](https://images.fireside.fm/podcasts/images/d/dec90738-e640-45e5-b375-4573052f4bf4/cover_small.jpg)](https://linuxactionnews.com) [![lan](https://images.fireside.fm/podcasts/images/d/dec90738-e640-45e5-b375-4573052f4bf4/cover_small.jpg)](https://linuxactionnews.com)
<<<<<<< HEAD
## [Episode 110](https://linuxactionnews.com/110) - 06/16/2019 ## [Episode 110](https://linuxactionnews.com/110) - 06/16/2019
=======
< HEAD
## [Episode 109](https://linuxactionnews.com/109) - 06/09/2019
=======
## [Episode 108](https://linuxactionnews.com/108) - 06/03/2019
>>>>>>> 252cbc83b45a933985c7223acd76ae4c41e3f596
>>>>>>> a7e3ad85f90dcbca6a49e4eb25513022f0c25e1c
### Description: ### Description: