Merge pull request #263 from KnzkDev/optimize-paperclip

author beatrix <beatrix.bitrot@gmail.com>

Tue, 12 Dec 2017 14:15:52 +0000 (09:15 -0500)

committer GitHub <noreply@github.com>

Tue, 12 Dec 2017 14:15:52 +0000 (09:15 -0500)
author beatrix <beatrix.bitrot@gmail.com>
Tue, 12 Dec 2017 14:15:52 +0000 (09:15 -0500)
committer GitHub <noreply@github.com>
Tue, 12 Dec 2017 14:15:52 +0000 (09:15 -0500)
diff --cc Gemfile
Simple merge
diff --cc Gemfile.lock
Simple merge
author	beatrix <beatrix.bitrot@gmail.com>
	Tue, 12 Dec 2017 14:15:52 +0000 (09:15 -0500)
committer	GitHub <noreply@github.com>
	Tue, 12 Dec 2017 14:15:52 +0000 (09:15 -0500)
		1	2
Gemfile	patch \|	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	patch \|	diff1 \|	diff2 \|	blob \| history