Merge conflicts

pull/240/merge
Dana 2016-08-04 10:02:16 +00:00
commit 3a4660b517
1 zmienionych plików z 1 dodań i 1 usunięć

Wyświetl plik

@ -1,7 +1,7 @@
{
"name": "c9",
"description": "New Cloud9 Client",
"version": "3.1.2966",
"version": "3.1.2980",
"author": "Ajax.org B.V. <info@ajax.org>",
"private": true,
"main": "bin/c9",