Merge remote-tracking branch 'origin/master' into mark_folder_as
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 5 Nov 2015 10:03:21 +0000 (13:03 +0300)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 5 Nov 2015 10:03:21 +0000 (13:03 +0300)
commit6771b5907f45b4cf964ba7e686501dfbe722cab2
treec2af533fb937d43acc119f7e10791601c56ff02e
parent456be55883ddfb5ff90930c628f5227439c79e71
parent461686e8ae5c8c6c5b067f63e019ea9018cdfae6
Merge remote-tracking branch 'origin/master' into mark_folder_as
platform/platform-resources-en/src/messages/LangBundle.properties