diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-05-30 12:17:26 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-05-30 12:17:26 +0200 |
| commit | d487cd5a6c3e6a7eaa125957a022495ba038b460 (patch) | |
| tree | 14e4f4ffccd4ccf2e41a4a9ce42fd20812a3222f /program/js/editor.js | |
| parent | ca1c2a8c9c69ddf92cfd07a9e5ff4ec1deb22b6b (diff) | |
| parent | 19cc5b91c963736fd06dd701d4a583ccdf4b5bfa (diff) | |
Merge branch 'dev-browser-capabilities'
Conflicts:
CHANGELOG
Diffstat (limited to 'program/js/editor.js')
0 files changed, 0 insertions, 0 deletions