-
Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 7c78dce0
# Conflicts: # android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/SerialActivity.java
Fernando Martínez Santiago committed
# Conflicts: # android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/SerialActivity.java