projects / WP-Themes / michsci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a73af10) | patch
fixing merge conflict
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 29 Dec 2015 18:40:31 +0000 (13:40 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 29 Dec 2015 18:40:31 +0000 (13:40 -0500)
commite7d81dd47b7ac0b542977e8eba2a2bb054d3fc92
treeef09aa21504d6190521c87446e43100ad3b64839tree | snapshot
parenta73af10eb7c0b5e6245a5b4cdcccd67f4d3061d2commit | diff
fixing merge conflict
css/app.css diff | blob | history
css/app.css.map diff | blob | history
scss/_body.scss diff | blob | history