Merge branch 'vue' of https://github.com/nextcloud/contacts into vue-import-progress

6 files changed, 28 insertions, 4 deletions

diff --git a/css/contacts.scss b/css/contacts.scss
index 503eaf1f..bfdc8614 100644
--- a/css/contacts.scss
+++ b/css/contacts.scss
@@ -1,3 +1,26 @@
+/**
+ * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ * @author Team Popcorn <teampopcornberlin@gmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+ 
 $grid-height-unit: 40px;
 $grid-input-padding: 7px;
 $grid-input-margin: 3px;
diff --git a/css/settings-section.scss b/css/settings-section.scss
index c0786008..31c81695 100644
--- a/css/settings-section.scss
+++ b/css/settings-section.scss
@@ -2,7 +2,7 @@
  * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
- * author Team Popcorn <teampopcornberlin@gmail.com>
+ * @author Team Popcorn <teampopcornberlin@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *
diff --git a/css/settings/settings-addressbook-sharee.scss b/css/settings/settings-addressbook-sharee.scss
index d11a5b6a..878dfa13 100644
--- a/css/settings/settings-addressbook-sharee.scss
+++ b/css/settings/settings-addressbook-sharee.scss
@@ -2,7 +2,7 @@
  * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
- * author Team Popcorn <teampopcornberlin@gmail.com>
+ * @author Team Popcorn <teampopcornberlin@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *
diff --git a/css/settings/settings-addressbook-shares.scss b/css/settings/settings-addressbook-shares.scss
index 917a87a4..33b67410 100644
--- a/css/settings/settings-addressbook-shares.scss
+++ b/css/settings/settings-addressbook-shares.scss
@@ -2,7 +2,7 @@
  * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
- * author Team Popcorn <teampopcornberlin@gmail.com>
+ * @author Team Popcorn <teampopcornberlin@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *
diff --git a/css/settings/settings-addressbook.scss b/css/settings/settings-addressbook.scss
index 6a72f935..b5d779c0 100644
--- a/css/settings/settings-addressbook.scss
+++ b/css/settings/settings-addressbook.scss
@@ -2,7 +2,7 @@
  * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
- * author Team Popcorn <teampopcornberlin@gmail.com>
+ * @author Team Popcorn <teampopcornberlin@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *
diff --git a/src/store/addressbooks.js b/src/store/addressbooks.js
index bbdff090..54bd6d8a 100644
--- a/src/store/addressbooks.js
+++ b/src/store/addressbooks.js
@@ -2,6 +2,7 @@
  * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
+ * @author Team Popcorn <teampopcornberlin@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *