Skip to content

Commit 3d67926

Browse files
authored
Merge pull request #155 from PropGit/master
Updated Gemfile for security, added PNut update notice.
2 parents 75ac2a3 + 8469d0c commit 3d67926

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

docs/Gemfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ GEM
6969
jekyll-theme-time-machine (= 0.1.1)
7070
jekyll-titles-from-headings (= 0.5.1)
7171
jemoji (= 0.10.1)
72-
kramdown (>= 2.3.0)
72+
kramdown (~> 2.3.0)
7373
liquid (= 4.0.0)
7474
listen (= 3.1.5)
7575
mercenary (~> 0.3)
@@ -96,7 +96,7 @@ GEM
9696
i18n (~> 0.7)
9797
jekyll-sass-converter (~> 1.0)
9898
jekyll-watch (~> 2.0)
99-
kramdown (~> 1.14)
99+
kramdown (~> 2.3.0)
100100
liquid (~> 4.0)
101101
mercenary (~> 0.3.3)
102102
pathutil (~> 0.9)
@@ -193,7 +193,7 @@ GEM
193193
gemoji (~> 3.0)
194194
html-pipeline (~> 2.2)
195195
jekyll (~> 3.0)
196-
kramdown (1.17.0)
196+
kramdown (~> 2.3.0)
197197
liquid (4.0.0)
198198
listen (3.1.5)
199199
rb-fsevent (~> 0.9, >= 0.9.4)

docs/p2.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ by Dave Hein
181181
## Recent Activity
182182
##### _Full details [here](https://github.com/parallaxinc/propeller/pulls?q=is%3Aclosed)._
183183

184+
* Updated [PNut to v34wb](https://propeller.parallax.com/p2.html#ides)
184185
* Added Jon Titus' [Smart Pin][P2SmartPinDoc] documentation
185186
* Added Jon "JonnyMac" McPhalen's object [Full Duplex Serial](https://github.com/parallaxinc/propeller/tree/master/libraries/community/p2/All/jm_full_duplex_serial)
186187
* Added [latest newsletter](https://propeller.parallax.com/p2.html#p2-community-newsletter) about upcoming P2 Live Forums.

0 commit comments

Comments
 (0)