From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 5 Sep 2019 12:30:15 +0000 (+0100)
Subject: Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/skel
X-Git-Tag: 1.3.3~1
X-Git-Url: https://git.distorted.org.uk/~mdw/skel/commitdiff_plain/a590b3b49392d71c2f6bebcdb6343e5050a1cf73

Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/skel

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/skel:
  Release 1.3.2.
  skelrc.sod: Add skeleton for Sod.

Conflicts:
	debian/changelog -- two 1.3.2 releases!
---

a590b3b49392d71c2f6bebcdb6343e5050a1cf73
diff --cc debian/changelog
index f94f0ab,0d906ab..d6fb804
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
--skel (1.3.2) experimental; urgency=medium
++skel (1.3.2x) experimental; urgency=medium
 +
 +  * Add template for Rust.
 +
 + -- Mark Wooding <mdw@distorted.org.uk>  Thu, 14 Feb 2019 13:15:56 +0000
 +
++skel (1.3.2y) experimental; urgency=medium
+ 
+   * Add template for Sod.
+ 
+  -- Mark Wooding <mdw@distorted.org.uk>  Fri, 09 Aug 2019 01:01:50 +0100
+ 
  skel (1.3.1) experimental; urgency=medium
  
    * Add template for Scala.