Commit graph

367 commits

Author SHA1 Message Date
Set Sakrecoer 40ca9f7fb4 resolve conflicts 2019-06-19 16:36:39 +02:00
Set Hallstrom 533ed079bd Updated 'index.html' via CloudCannon 2019-06-19 14:32:49 +00:00
Set Hallstrom 2aad281c79
Merge pull request #26 from linduxed/patch-1
Fix copy in about.html
2019-06-10 10:37:49 +02:00
Mikael Muszynski 272c00a3e7
Fix copy in about.html
* `s/midlemen/middlemen/`
* `s/midlehand/middleman/` - I suspect this is a direct translation of
  "mellanhand", which should be translated as "middleman".
2019-06-10 09:39:24 +02:00
Set Hallstrom 1d50994aae Updated 'index.html' via CloudCannon 2019-04-26 12:23:00 +00:00
Set Hallstrom e8af99baff Updated 2 files via CloudCannon 2019-04-26 11:29:58 +00:00
Set Sakrecoer d29253f4a9 typos 2019-04-15 19:24:47 +02:00
Set Hallstrom 16bf70b4b5
Merge pull request #25 from Basspistol/content 2019-04-14 11:10:47 +02:00
Set Hallstrom bd6cb21a7b Updated 'radio.html' via CloudCannon 2019-04-14 09:09:20 +00:00
Set Hallstrom 10805372fe Updated '_includes/style.css' via CloudCannon 2019-04-14 08:58:17 +00:00
Set Hallstrom 867d17c5e7
Merge pull request #24 from Basspistol/content 2019-04-13 18:13:13 +02:00
Set Sakrecoer 9a39a251c4 icons 2019-04-13 18:12:19 +02:00
Set Hallstrom 54e788888c Updated 'siteicon.png' via CloudCannon 2019-04-13 16:08:02 +00:00
Set Hallstrom 5b264a64f9 Updated 'siteicon.png' via CloudCannon 2019-04-13 16:07:31 +00:00
Set Sakrecoer aaf87bfac7 pimping icons 2019-04-13 18:05:20 +02:00
Set Sakrecoer fcf73b99e3 big mistake 2019-04-13 17:07:29 +02:00
Set Sakrecoer 6e8c4ea43e reverting 404 2019-04-13 17:06:16 +02:00
Set Sakrecoer e1707b9df3 Merge branch 'master' of github.com:Basspistol/basspistol.com 2019-04-13 17:02:23 +02:00
Set Sakrecoer 2ef36bba23 fixing 404 2019-04-13 17:02:20 +02:00
Set Hallstrom de82b5eb95 Updated 'index.html' via CloudCannon 2019-04-13 14:44:23 +00:00
Set Hallstrom 422de6fc7f Updated '_includes/footer.html' via CloudCannon 2019-04-13 14:42:30 +00:00
Set Sakrecoer b61d290dda editable footer 2019-04-13 16:40:45 +02:00
Set Sakrecoer 1733627b84 ascii dangit 2019-04-13 16:01:10 +02:00
Set Hallstrom e3dc5f99d0 Updated '_drafts/dabke-chobi.md' via CloudCannon 2019-04-13 13:57:26 +00:00
Set Hallstrom 66afcd0b97 Updated '_drafts/dabke-chobi.md' via CloudCannon 2019-04-13 13:56:49 +00:00
Set Hallstrom 289e681cfd
Merge pull request #22 from Basspistol/developement 2019-04-13 15:53:47 +02:00
Set Sakrecoer deb6bb7e9d ascii headz 2019-04-13 15:51:37 +02:00
Set Sakrecoer 21b354b18a ascii headz 2019-04-13 15:51:11 +02:00
Set Sakrecoer 75bcef696f ascii head 2019-04-13 15:50:16 +02:00
Set Hallstrom fc3b729d24 Deleted '_drafts/dabke-chobi.md' via CloudCannon 2019-04-13 13:03:52 +00:00
Set Sakrecoer e229a989c4 Merge branch 'master' of github.com:Basspistol/basspistol.com 2019-04-13 14:38:06 +02:00
Set Sakrecoer 12db03501e Merge branch 'content' 2019-04-13 14:37:45 +02:00
Set Sakrecoer 00743ab20c removing redundant meta data 2019-04-13 14:37:23 +02:00
Set Hallstrom 7f2a1cfb61 Updated '_drafts/dabke-chobi.md' via CloudCannon 2019-04-13 11:58:41 +00:00
Set Hallstrom 577fb1d68d Added '_drafts/dabke-chobi.md' via CloudCannon 2019-04-13 11:53:00 +00:00
Set Hallstrom 95418ed8e1 Deleted '_drafts/test.md' via CloudCannon 2019-04-13 11:37:58 +00:00
Set Hallstrom f6bcdbbed2 Added '_drafts/test.md' via CloudCannon 2019-04-13 11:32:10 +00:00
Set Hallstrom f79b317a2f
Merge pull request #21 from Basspistol/content 2019-04-02 21:34:34 +02:00
CloudCannon Client 4e4d3876d6 Updated 'about.html' via CloudCannon 2019-04-02 19:17:25 +00:00
Set Hallstrom 8d2b8c4086
Merge pull request #20 from Basspistol/content 2019-04-02 19:26:22 +02:00
CloudCannon Client 3ecb3b017b Updated 2 files via CloudCannon 2019-04-02 17:24:54 +00:00
CloudCannon Client 4107aa9480 Updated '_posts/2016-09-05-pingnu.md' via CloudCannon 2019-04-02 17:24:38 +00:00
CloudCannon Client e1d1f6d00a Moved '_posts/2019-01-20-kastufesdenous.md' to '_posts/2019-01-20-kas-tu-fait-de-nous.md' via CloudCannon 2019-04-02 17:24:13 +00:00
CloudCannon Client 0a697b9fe3 Updated '_posts/2019-02-09-darkweb.md' via CloudCannon 2019-04-02 17:23:54 +00:00
Set Hallstrom 9c26807ba8
Merge pull request #19 from Basspistol/content 2019-04-02 19:22:35 +02:00
CloudCannon Client 672c4d6a8f Updated '_posts/2019-04-02-spark-master-tape.md' via CloudCannon 2019-04-02 17:21:56 +00:00
Set Hallstrom 637b49d663
Merge pull request #18 from Basspistol/content 2019-04-02 19:09:48 +02:00
CloudCannon Client 04f6060d75 Updated '_posts/2019-04-02-spark-master-tape.md' via CloudCannon 2019-04-02 17:09:31 +00:00
CloudCannon Client 25b1875d31 Moved '_drafts/spark-master-tape.md' to '_posts/2019-04-02-spark-master-tape.md' via CloudCannon 2019-04-02 17:08:09 +00:00
Set Hallstrom b5e6193334
Merge pull request #17 from Basspistol/content 2019-04-02 19:07:37 +02:00