summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorJohn Ahlroos <john@vaadin.com>2012-09-28 09:36:03 +0300
committerJohn Ahlroos <john@vaadin.com>2012-09-28 09:36:03 +0300
commit4a244823d6be091f7bf0b13d0e2d9989f3e84a0b (patch)
treec781e2761e43452c79aeed445cb428f0820c800d /server
parent40ba18c97ef962121215e0d93f9b5073767dbef0 (diff)
parented2d516f04fd156814cc43c55d36f567e2611ba2 (diff)
downloadvaadin-framework-4a244823d6be091f7bf0b13d0e2d9989f3e84a0b.tar.gz
vaadin-framework-4a244823d6be091f7bf0b13d0e2d9989f3e84a0b.zip
Merge branch 'master' into primary-stylename
Diffstat (limited to 'server')
-rw-r--r--server/src/com/vaadin/ui/CustomLayout.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/server/src/com/vaadin/ui/CustomLayout.java b/server/src/com/vaadin/ui/CustomLayout.java
index a01ff78044..39540a3882 100644
--- a/server/src/com/vaadin/ui/CustomLayout.java
+++ b/server/src/com/vaadin/ui/CustomLayout.java
@@ -53,8 +53,6 @@ import com.vaadin.shared.ui.customlayout.CustomLayoutState;
* </p>
*
* @author Vaadin Ltd.
- * @author Duy B. Vo (<a
- * href="mailto:devduy@gmail.com?subject=Vaadin">devduy@gmail.com</a>)
* @since 3.0
*/
@SuppressWarnings("serial")