Skip to content

P

Projects
G

Groups
S

Snippets
Help

huangzhicong / SmartCanteen

This project
Loading...
Sign in

Go to a project

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

Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts

Switch branch/tag

SmartCanteen
..
smartcanteen
MainActivity.java

Blame History Permalink

Merge branch 'new_master' into new_for_phone · 21199278
```
# Conflicts:
#	app/src/main/java/com/bgycc/smartcanteen/MainActivity.java
```
pye52 committed Mar 09, 2020
21199278

MainActivity.java 20.3 KB