Fix merge

This commit is contained in:
Sam Potts
2019-03-16 12:15:20 +11:00
parent 35f7ee9c59
commit 848e798809
11 changed files with 24664 additions and 6 deletions
+2
View File
File diff suppressed because one or more lines are too long
+1
View File
File diff suppressed because one or more lines are too long
+1 -6
View File
@@ -107,12 +107,7 @@
<div class="call-to-action"> <div class="call-to-action">
<span class="button--with-count"> <span class="button--with-count">
<a <a <a href="https://github.com/sampotts/plyr" target="_blank" class="button js-shr-button">
<a href="https://github.com/sampotts/plyr" target="_blank" class="button js-shr-button">
target="_blank"
class="button"
data-shr-network="github"
>
<svg class="icon" role="presentation"> <svg class="icon" role="presentation">
<title>GitHub</title> <title>GitHub</title>
<path <path
+2
View File
File diff suppressed because one or more lines are too long
+1
View File
File diff suppressed because one or more lines are too long
+12330
View File
File diff suppressed because it is too large Load Diff
+2
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+12322
View File
File diff suppressed because it is too large Load Diff