diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-07-13 15:46:31 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-07-13 15:46:31 +0300 |
| commit | ae5793ae460cab22612c134cbec4b8ae6ed4175b (patch) | |
| tree | e24c1924cc4882a273707661d16d9a67c875aa31 /.gitignore | |
| parent | 40dcbc3cfaa438c9b879720c9012331dd85ca694 (diff) | |
| parent | 96e10ed8be9ec1e694001098584361e43eb35af2 (diff) | |
| download | vaadin-framework-ae5793ae460cab22612c134cbec4b8ae6ed4175b.tar.gz vaadin-framework-ae5793ae460cab22612c134cbec4b8ae6ed4175b.zip | |
Merge remote-tracking branch 'origin/master' into grid-unbuffered-editor
Change-Id: Id630861d5089b0deabbccffe66d971252c44f46b
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 1433651abc..4b28bcd6e0 100644 --- a/.gitignore +++ b/.gitignore @@ -53,6 +53,8 @@ WebContent/VAADIN/vaadinPush.js WebContent/VAADIN/vaadinPush.debug.js +WebContent/VAADIN/vaadinPush.js.gz +WebContent/VAADIN/vaadinPush.debug.js.gz # /WebContent/WEB-INF/ /WebContent/WEB-INF/classes @@ -75,6 +77,9 @@ WebContent/VAADIN/vaadinPush.debug.js # Mac *.DS_Store +# Python +scripts/*.pyc + # build result folders */result result |