projects
/
WP-Themes
/
petoskeyveterinarian.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
00ccab6
93562cc
)
Merge branch 'release/1.0.0'
author
Ian Weller
<ian@gaslightmedia.com>
Wed, 24 May 2017 16:58:57 +0000
(12:58 -0400)
committer
Ian Weller
<ian@gaslightmedia.com>
Wed, 24 May 2017 16:58:57 +0000
(12:58 -0400)
Conflicts:
style.css
1
2
style.css
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
style.css
index
38d2fd7
,
efbab0d
..
ec31634
---
1
/
style.css
---
2
/
style.css
+++ b/
style.css
@@@
-1,7
-1,7
+1,7
@@@
/*
- Theme Name:
CampPetosega
+ Theme Name:
BayshoreAnimalHospital
Author: Gaslight Media
Author URI: http://www.gaslightmedia.com
- Description: A theme based off of CampPetosega
- Version: 1.0.28
+ Description: A theme made for BayshoreAnimalHospital
-Version: 1.0
++Version: 1.0.0
*/