android/Pictogram/app/src · 85d680e833e0d9b78cc1a18dcf2d358c259bb2c4 · yotta / pictogram · GitLab

Find file History

Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into fernando_branch · 85d680e8
```
# Conflicts:
#	android/Pictogram/Pictogram.iml
#	android/Pictogram/app/src/main/res/raw/pcbdb_create.sql
```
Fernando Martínez Santiago committed Jul 19, 2016
85d680e8

Name	Last commit	Last Update
..
fernandoFlavor		Loading commit data...
main		Loading commit data...