android/Pictogram/supervisor_tablet/src/main · 48e86a5ecf5be0ecb6bcabeb8b5c927b8c66591e · yotta / pictogram

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

committed Mar 10, 2017

57b7f0d8 Browse Files

Name	Last commit	Last Update
..
assets/core_vocabulary		Loading commit data...
java/com/yottacode/pictogram/supervisor_tablet/net		Loading commit data...
res		Loading commit data...
AndroidManifest.xml		Loading commit data...