android/Pictogram/app/src · 741bbc4251421c50139a2b0055560d9bfa0634c0 · yotta / pictogram · GitLab

Find file History

Merge branch 'master' of http://scm.ujaen.es/softuno/pictogram into fernando_branch · 741bbc42
```
Conflicts:
	android/Pictogrammar/.idea/gradle.xml
	android/Pictogrammar/app/app.iml
```
Fernando Martínez Santiago committed Mar 17, 2016
741bbc42 Browse Directory

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