Gaboso ccaa2edeb0 Merge branch 'master' of https://github.com/RipMeApp/ripme into logger ... # Conflicts: # src/main/java/com/rarchives/ripme/ripper/VideoRipper.java # src/main/java/com/rarchives/ripme/ripper/rippers/VscoRipper.java		2018-06-04 22:36:14 -04:00
..
java/com/rarchives/ripme	Merge branch 'master' of https://github.com/RipMeApp/ripme into logger	2018-06-04 22:36:14 -04:00
resources	Merge pull request #625 from cyian-1756/refactoring	2018-05-29 23:49:11 -04:00