Download as
Browse Code »

Commit 7e1a8498901164afda238e5693ee298cf06f1916

Authored by gtaaas
1 parent 05704252
Exists in master and in 1 other branch devel

Merging [Problema #1029, Funcionalidade #1022 e #1033]

Showing 3 changed files with 3 additions and 2 deletions   Show diff stats
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 /public/xml 15 /public/xml
16 /public/videos 16 /public/videos
17 /public/system/slibras/contents/videos 17 /public/system/slibras/contents/videos
  18 +/public/dictionary/*
18 19
19 /*~ 20 /*~
20 /db/*.sqlite3 21 /db/*.sqlite3
@@ -109,7 +109,7 @@ GEM @@ -109,7 +109,7 @@ GEM
109 mini_magick (3.4) 109 mini_magick (3.4)
110 subexec (~> 0.2.1) 110 subexec (~> 0.2.1)
111 multi_json (1.1.0) 111 multi_json (1.1.0)
112 - mysql2 (0.3.15) 112 + mysql2 (0.3.11)
113 nokogiri (1.5.2) 113 nokogiri (1.5.2)
114 oj (2.1.4) 114 oj (2.1.4)
115 orm_adapter (0.0.6) 115 orm_adapter (0.0.6)
1 -270 1 +1080