Name |
Last commit
|
Last Update |
---|---|---|
android | ||
sails | ||
.editorconfig | ||
.gitignore | ||
CONTRIBUTING.md | ||
README.md |
# 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
Name |
Last commit
|
Last Update |
---|---|---|
android | Loading commit data... | |
sails | Loading commit data... | |
.editorconfig | Loading commit data... | |
.gitignore | Loading commit data... | |
CONTRIBUTING.md | Loading commit data... | |
README.md | Loading commit data... |