History

Add trademark notices on the About page

Thibaut committed 12 years ago

Commit c6109741 parent 8171fe61 file · +2 −2Browse files

Unified · Split

assets/javascripts/templates/pages/about_tmpl.coffee+2−2
@@ -130,7 +130,7 @@ credits = [ · 129 unmodified lines
130130 'https://raw.github.com/lodash/lodash/master/LICENSE.txt'
131131 ], [
132132 'Node.js',
133− 'Joyent, Inc. and other Node contributors',
133+ 'Joyent, Inc. and other Node contributors<br>Node.js is a trademark of Joyent, Inc.',
134134 'MIT',
135135 'https://raw.github.com/joyent/node/master/LICENSE'
136136 ], [
@@ -145,7 +145,7 @@ credits = [ · 8 unmodified lines
145145 'https://www.ruby-lang.org/en/about/license.txt'
146146 ], [
147147 'Ruby on Rails',
148− '2004-2013 David Heinemeier Hansson',
148+ '2004-2013 David Heinemeier Hansson<br>Rails, Ruby on Rails, and the Rails logo are trademarks of David Heinemeier Hansson.',
149149 'MIT',
150150 'https://raw.github.com/rails/rails/master/activerecord/MIT-LICENSE'
151151 ], [