Conflicts: build.properties client/src/com/vaadin/client/ApplicationConnection.java client/src/com/vaadin/client/extensions/ResponsiveConnector.java server/src/com/vaadin/server/Responsive.java Change-Id: I49f90521611d1b86704a60c3d003cdeea9c3b864 |
vor 10 Jahren | |
---|---|---|
.. | ||
src/com/vaadin | Merge changes from origin/7.2 into master | vor 10 Jahren |
build.xml | Unified xml files to end with new line | vor 10 Jahren |
ivy.xml | Override the cssparser dependency from sass-compiler (#13532) | vor 10 Jahren |