diff options
| author |   Dan Klein <danklein10@gmail.com> | 2015-12-20 00:07:44 +0200 |
|---|---|---|
| committer | Dan Klein <danklein10@gmail.com> | 2015-12-20 00:07:44 +0200 |
| commit | 4ca24cf31919870a684fe78f17c856e0d220e6d5 (patch) | |
| tree | f40ab95e52adca3ac713d61eb9fa3fd0d136e4ea /VERSION | |
| parent | 1895d21485621c3428d045fa0f5b9daf165c8260 (diff) | |
| parent | 5cef472bcdc6c0b7e20e5cc42485ed5570c10f8c (diff) | |
Merge branch 'master' into dan_stateless
Diffstat (limited to 'VERSION')
| -rwxr-xr-x | VERSION | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,4 +1,5 @@ -v1.80 +v1.83 + |