diff options
| author | Jon Reid | 2012-07-17 16:03:14 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-07-17 16:03:14 -0700 |
| commit | 42a51e0c27f2e2cd825d07b3af5ec05b0e5208b3 (patch) | |
| tree | 67deeb8c5b34aacc91f737cc64a3bc9ef1f4f05f /imports/codemirror/LICENSE | |
| parent | a12cabc16273ffe04af4bce1f7438dc9326efa89 (diff) | |
| parent | b4b3e45d6684e77d361b4f8ca5be4889428320c5 (diff) | |
| download | ninja-42a51e0c27f2e2cd825d07b3af5ec05b0e5208b3.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'imports/codemirror/LICENSE')
| -rw-r--r-- | imports/codemirror/LICENSE | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/LICENSE b/imports/codemirror/LICENSE index f62410e6..3916e96b 100644 --- a/imports/codemirror/LICENSE +++ b/imports/codemirror/LICENSE | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2011 by Marijn Haverbeke <marijnh@gmail.com> | 1 | Copyright (C) 2012 by Marijn Haverbeke <marijnh@gmail.com> |
| 2 | 2 | ||
| 3 | Permission is hereby granted, free of charge, to any person obtaining a copy | 3 | Permission is hereby granted, free of charge, to any person obtaining a copy |
| 4 | of this software and associated documentation files (the "Software"), to deal | 4 | of this software and associated documentation files (the "Software"), to deal |