Skip to content

Commit 31f04d5

Browse files
authored
Merge pull request #183 from mike-casas/fix-pr#106
Fixed conflict pr#106. Update JWT Scala and add it to index
2 parents 97ef554 + 90d1f42 commit 31f04d5

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

html/index.jade

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ html(lang='en')
271271
include libraries/rust.jade
272272
include libraries/lua.jade
273273
include libraries/scala.jade
274+
include libraries/scala2.jade
274275
include libraries/d.jade
275276
include libraries/clojure.jade
276277
include libraries/objective-c.jade

views/index.jade

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ block content
179179
include libraries/rust.jade
180180
include libraries/lua.jade
181181
include libraries/scala.jade
182+
include libraries/scala2.jade
182183
include libraries/scala3.jade
183184
include libraries/d.jade
184185
include libraries/clojure.jade

views/libraries/scala2.jade

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ article.jwt-scala.accordion(data-accordion)
1313
i.icon-budicon-500
1414
| Verify
1515
p
16-
i.icon-budicon-501
16+
i.icon-budicon-500
1717
code iss
1818
| check
1919
p
2020
i.icon-budicon-501
2121
code sub
2222
| check
2323
p
24-
i.icon-budicon-501
24+
i.icon-budicon-500
2525
code aud
2626
| check
2727
p
@@ -81,4 +81,4 @@ article.jwt-scala.accordion(data-accordion)
8181
a(href='https://github.com/pauldijou/jwt-scala') View Repo
8282

8383
.panel-footer
84-
code sbt: "pdi" %% "jwt-core" % "0.3.0"
84+
code sbt: "pdi" %% "jwt-core" % "0.4.1"

0 commit comments

Comments
 (0)