jaredbswll / RateMyProfessor

0 stars 1 forks source link

Merge branch 'search-by-class' of https://github.com/jaredbswll/RateM… #62

Closed MasonWindus closed 5 years ago

MasonWindus commented 5 years ago

…yProfessor

Conflicts:

.idea/caches/build_file_checksums.ser

app/src/main/AndroidManifest.xml

app/src/main/res/values/strings.xml

Currently (12/6/18, 18:44) most updated and working version