Permalink
Browse files

Merge branch 'master' of github.com:shutterstock/rickshaw

  • Loading branch information...
2 parents 992b927 + 56df56d commit f7d3f63d81f721d1d5418e09dd169168728dbe2f @dchester dchester committed Sep 22, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 README.md
View
@@ -12,10 +12,10 @@ var graph = new Rickshaw.Graph( {
series: [
{
color: 'steelblue',
- data: [ { x: 0, y: 23}, { x: 1, y: 15 }, { x: 2, y: 79 } ],
+ data: [ { x: 0, y: 23}, { x: 1, y: 15 }, { x: 2, y: 79 } ]
}, {
color: 'lightblue',
- data: [ { x: 0, y: 30}, { x: 1, y: 20 }, { x: 2, y: 64 } ],
+ data: [ { x: 0, y: 30}, { x: 1, y: 20 }, { x: 2, y: 64 } ]
}
]
} );
@@ -156,7 +156,7 @@ This library was developed by David Chester, Douglas Hunter, and Silas Sewell at
## License
-Copyright (C) 2011 by Shutterstock Images, LLC
+Copyright (C) 2011-2012 by Shutterstock Images, LLC
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:

0 comments on commit f7d3f63

Please sign in to comment.