Skip to content

P

Projects
G

Groups
S

Snippets
Help

yotta / pictogram

This project
Loading...
Sign in

Go to a project

Project
Repository
Issues 60
Merge Requests 0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards

Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts

History Permalink

Switch branch/tag

pictogram
..
drawable-hdpi
picton.png

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

picton.png 4.44 KB

Download (4.44 KB)