aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorTulir Asokan <tulir@maunium.net>2019-01-17 14:13:25 +0200
committerTulir Asokan <tulir@maunium.net>2019-01-23 00:26:51 +0200
commitbf2a5e9b3495912bc4e266052e15cceedab131cf (patch)
tree140aac130323f5585a87c7dddb5af49dadb03f33 /config
parentcdb79be7d7ba10807bc1db1f3e52887b04a4b0fd (diff)
Update license and sort imports
Diffstat (limited to 'config')
-rw-r--r--config/config.go15
-rw-r--r--config/config_test.go10
2 files changed, 13 insertions, 12 deletions
diff --git a/config/config.go b/config/config.go
index 8f45d76..0ddb4a3 100644
--- a/config/config.go
+++ b/config/config.go
@@ -1,31 +1,32 @@
// gomuks - A terminal Matrix client written in Go.
-// Copyright (C) 2018 Tulir Asokan
+// Copyright (C) 2019 Tulir Asokan
//
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
+// 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 General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
package config
import (
+ "encoding/json"
"io/ioutil"
"os"
"path/filepath"
-
- "encoding/json"
"strings"
"gopkg.in/yaml.v2"
+
"maunium.net/go/mautrix"
+
"maunium.net/go/gomuks/debug"
"maunium.net/go/gomuks/matrix/pushrules"
"maunium.net/go/gomuks/matrix/rooms"
diff --git a/config/config_test.go b/config/config_test.go
index ae7e725..f782618 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -1,18 +1,18 @@
// gomuks - A terminal Matrix client written in Go.
-// Copyright (C) 2018 Tulir Asokan
+// Copyright (C) 2019 Tulir Asokan
//
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
+// 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 General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
package config_test