Merge branch 'developer' of master.render.es:/home/dedalo/master_deda…

…lo into developer
renderpci · Dec 13, 2018 · 8d0fa1b · 8d0fa1b
2 parents e7c6d7e + 9e83b27
commit 8d0fa1b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7,200 deletions.
diff --git a/.gitignore b/.gitignore
@@ -70,6 +70,10 @@ lib/dedalo/*/*-min.css
 #lib/dedalo/*/*.css.map
 lib/dedalo/*/*/js/*-min.js
 
+
+lib/dedalo/extras/cedis
+lib/dedalo/extras/render
+
 cookie_auth.php
 
 /lib/dedalo/button_delete/js/button_delete-min.js