-
Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · 57b7f0d8
# Conflicts: # android/Pictogram/tabletlibrary/build.gradle # android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictogramActivity.java # android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/login/MainActivity.java # android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/net/NetServiceTablet.java
Fernando Martínez Santiago committed
