Skip to content

Commit 5b55227

Browse files
author
mrmrs
committed
Merge branch 'master' into gh-pages
* master: Update markup. This is a new year. Changes title. Conflicts: index.html
2 parents 7611872 + 48a4d01 commit 5b55227

File tree

2 files changed

+454
-61
lines changed

2 files changed

+454
-61
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ just edit ```css/i.css```
5757
[Mozilla HTML element list](http://https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/HTML5/HTML5_element_list "Mozilla HTML element list")
5858

5959
# MIT LICENSE
60-
Copyright (c) 2013 Adam Morse http://opensource.org/licenses/MIT
60+
Copyright (c) 2014 Adam Morse http://opensource.org/licenses/MIT
6161

6262
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
6363

0 commit comments

Comments
 (0)