12 Commits

Author	SHA1	Message	Date
NerdNumber9	df2a4779bf	Merge branch 'master' of https://github.com/inorichi/tachiyomi ... # Conflicts: # .travis.yml # README.md # app/build.gradle # app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt # app/src/main/res/layout/manga_info_controller.xml # app/src/main/res/raw/changelog_release.xml	2018-04-14 21:11:29 -04:00
inorichi	95e60ed775	Update cloudflare interceptor and android studio	2018-04-05 10:36:29 +02:00
NerdNumber9	908128b55d	Merge upstream changes	2017-11-29 21:53:02 -05:00
inorichi	d545cfd38c	Update Android Studio to 3.0	2017-10-28 14:44:19 +02:00
NerdNumber9	9dbb59f337	Upstream merge ... Internal permission change Fix url adder	2017-05-04 23:38:17 -04:00
len	c00eaae62b	AS 2.3 and Kotlin 1.1	2017-03-03 17:42:46 +01:00
len	46e09d174b	Travis fix. Update gradle	2016-09-01 20:05:11 +02:00
len	b1d7167112	Bump dependencies	2016-06-15 13:18:27 +02:00
Jozef Hollý	2e6fc70353	Auto number of latest release, shorter versionCode (#280)	2016-04-27 22:18:36 +02:00
len	4ccce424de	Reader view in Kotlin. Upgrade gradle wrapper. Remove ButterKnife from the project	2016-03-18 20:21:30 +01:00
inorichi	c35184abdc	Upgrade gradle. Other minor changes	2016-02-06 00:37:11 +01:00
inorichi	b69510e972	Initial commit	2015-09-24 17:27:43 +02:00