Merge branch 'hotfix/1.2.3' V1.2.3
authorLaury GvR <laury@gaslightmedia.com>
Mon, 23 May 2016 20:34:04 +0000 (16:34 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 23 May 2016 20:34:04 +0000 (16:34 -0400)
commitbdcb2be340df2da7cec643bc1a7763717c66a10f
tree7e727aca22d25433f8ce2120eb2e939fce30c73b
parent84df9dd8e74800dd030f8c3b06b4f46d5c89567b
parent8ef35bcda7262f4b2e73a4914020264e234a69f9
Merge branch 'hotfix/1.2.3'