Merge branch '0.2.x' into 0.3.x
Conflicts: blkmaker_jansson.c
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2013 Luke Dashjr
|
||||
* Copyright 2012-2014 Luke Dashjr
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the standard MIT license. See COPYING for more details.
|
||||
|
||||
Reference in New Issue
Block a user