Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HW5 #59

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

HW5 #59

Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge remote-tracking branch 'origin/master'
Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/ru/ifmo/android_2015/homework5/InitSplashActivity.java
	app/src/main/java/ru/ifmo/android_2015/homework5/ProgressCallback.java
	app/src/main/res/values/strings.xml
ermilova committed Dec 26, 2015
commit b942d29e6e137fb54be71f8a787384befca06185

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.