Twitter Conversion Tracking on Home Page

Twitter Conversion Tracking on Home Page
Conflict
Merge branch 'master' of https://github.com/Saltzshaker/pop-up-archive
merge conflict.  Please enter the commit message for your changes. Lines
starting
merge conflict w evil twitter pixel
Twitter Conversion Tracking on Home Page

Twitter Conversion Tracking on Home Page
Conflict
Merge branch 'master' of https://github.com/popuparchive/pop-up-archive

Trying to pull upstream master

nov2014 in master
Merge branch 'master' of https://github.com/Saltzshaker/pop-up-archive
search bar width
Transcript Tweaks

*Moved download button to right of search bar, added margin
*Player width
*Transcript Type ? icon on Item label
*Copy tweaks
—“Upgrade to Premium” -> “Reprocess as Premium”
—“{Edit, Save, Expand, Collapse} Transcript” -> Delete “Transcript” to
save space
—“SRT Format” —> “SRT Format (Captions)”
— transcriptType message edit
Merge pull request #752 from Saltzshaker/transcript-tweaks

Transcript tweaks