Anthony Restaino 051a453e7b Merge remote-tracking branch 'origin/master' into dev ...

Conflicts:
	app/src/main/res/values-sr/strings.xml

2015-05-04 12:30:17 -04:00

..

libs

Switch to gradle!!!

2015-05-02 12:40:40 -04:00

src/main

Merge remote-tracking branch 'origin/master' into dev

2015-05-04 12:30:17 -04:00

.gitignore

improvements for android studio

2015-05-04 18:00:39 +02:00

app.iml

Switch to gradle!!!

2015-05-02 12:40:40 -04:00

build.gradle

Merge branch 'pr/229' into dev

2015-05-04 12:23:51 -04:00

proguard-project.txt

improvements for android studio

2015-05-04 18:00:39 +02:00