| commit | 126e5fb039452a5b47898411f0062a90d7655e0f | [log] [tgz] |
|---|---|---|
| author | Ilya Mikhailov <mikhailov@aboutecho.com> | Tue Jan 28 19:07:28 2014 +0400 |
| committer | Ilya Mikhailov <mikhailov@aboutecho.com> | Tue Jan 28 19:07:28 2014 +0400 |
| tree | af4a3a3198d086071f7a8d31d0b16fe638f566df | |
| parent | a49d2a875429f8c99326f21396493565c3ea3acd [diff] | |
| parent | badb838fad6d13c3d4a3a1225c5b805121acbee0 [diff] |
Merge branch 'master' into rc1.3.7 Conflicts: app-manifest.json package.json