Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
  • Loading branch information
@nonproto
nonproto committed Apr 6, 2019
2 parents 1265aac + 8aff49e commit d4cb148
Show file tree
Hide file tree
Showing 2 changed files with 258 additions and 258 deletions.
Loading

0 comments on commit d4cb148

Please sign in to comment.