From: Bdale Garbee <bdale@gag.com>
Date: Wed, 28 Aug 2013 21:19:15 +0000 (-0600)
Subject: TeleMini sn re-assigned from 92 to 96 to resolve conflict.
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=77f6661cd893dadf422376a7302be97105f4a9a8;p=web%2Faltusmetrum

TeleMini sn re-assigned from 92 to 96 to resolve conflict.

Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum

Conflicts:
	production.mdwn
---

77f6661cd893dadf422376a7302be97105f4a9a8
diff --cc production.mdwn
index f5930a3,1bdbe64..aa12bcc
--- a/production.mdwn
+++ b/production.mdwn
@@@ -295,14 -295,6 +295,18 @@@ EasyMini v0.1 2013.05.19
  
  TeleMini v1.1 2013.05.22.
  
 +## sn 92-93 ##
 +
 +TeleMetrum v1.9 2013.08.27
 +
 +## sn 94-95 ##
 +
 +TeleMega v0.4 P 2013.08.28
 +
++## sn 96 ##
++
++TeleMini v1.1 2013.08.25. From Phoenix panel.
++
  ## sn 100-207 ##
  
  First production run of 108 pieces of TeleDongle v0.2 by