diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-03-27 09:01:42 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-03-27 09:01:42 -0400 |
| commit | e13e64711f7a7e8ceadb8cbc6af72c4022c95b36 (patch) | |
| tree | fe0e956b1d660cd08d41757d25c8adcb3463568c /Makefile | |
| parent | d8b42070186c12f6320fe54ea1c405149846404c (diff) | |
| parent | 9e6db178b09387e21ac19ce85369cf1ca7a443e8 (diff) | |
| download | chat-e13e64711f7a7e8ceadb8cbc6af72c4022c95b36.tar.gz chat-e13e64711f7a7e8ceadb8cbc6af72c4022c95b36.tar.bz2 chat-e13e64711f7a7e8ceadb8cbc6af72c4022c95b36.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -384,10 +384,10 @@ test-data: start-docker ## Add test data to the local instance. $(GO) run $(GOFLAGS) $(GO_LINKER_FLAGS) $(PLATFORM_FILES) sampledata -w 1 @echo You may need to restart the Mattermost server before using the following - @echo ==================================================================================== - @echo Login with a system admin account email=user-0@sample.mattermost.com password=user-0 - @echo Login with a regular account email=user-1@sample.mattermost.com password=user-1 - @echo ==================================================================================== + @echo ======================================================================== + @echo Login with a system admin account username=sysadmin password=sysadmin + @echo Login with a regular account username=user-1 password=user-1 + @echo ======================================================================== run-server: start-docker ## Starts the server. @echo Running mattermost for development |