android/Pictogram · 19086f8eeab4d632edd0f0c8f001110a0cbd2f9e · yotta / pictogram

Merge remote-tracking branch 'origin/develop' into fernando_branch · 19086f8e

# Conflicts:
#	.gitignore
#	android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/tools/PCBcontext.java
#	android/Pictogram/tablet/src/main/java/com/yottacode/pictogram/tablet/net/NetServiceTablet.java
#	sails/src/assets/app/i18n/en-gb.json

committed Aug 30, 2016

19086f8e Browse Files

Name	Last commit	Last Update
..
app/build		Loading commit data...
commonlibrary		Loading commit data...
docs		Loading commit data...
gradle/wrapper		Loading commit data...
tablet		Loading commit data...
watch		Loading commit data...
.gitignore		Loading commit data...
Pictogram.iml		Loading commit data...
build.gradle		Loading commit data...
gradle.properties		Loading commit data...
gradlew		Loading commit data...
gradlew.bat		Loading commit data...
settings.gradle		Loading commit data...