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

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