-
Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · 283cc883
# Conflicts: # android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/grammar/Vocabulary.java # android/Pictogram/supervisor/supervisor.iml # android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/VOCA.java
Fernando Martínez Santiago committed
