Merge branch 'master' into development, to avoid clashes when removing

unused .bzrignore file.
2014-07-13 19:26:53 +02:00 · 2014-07-13 19:26:53 +02:00 · 601d8ba1b8
commit 601d8ba1b8
parent 32369b3fb2 e5e3842bfc
1 changed files with 0 additions and 2 deletions
--- a/.bzrignore
+++ b/.bzrignore
@ -1,2 +0,0 @@
-json_prueba_2.json
-json_prueba.json