Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
chat
fairchat
Commits
f4ce25e3
Commit
f4ce25e3
authored
Aug 21, 2017
by
armin
Browse files
Merge branch '18-add-demo-rocket-chat-to-list-of-immutable-servers' into 'master'
Resolve "add demo.rocket.chat to list of immutable servers" Closes
#18
See merge request
!15
parents
10cadaee
7bb741af
Changes
3
Hide whitespace changes
Inline
Side-by-side
engine
@
8b653c6a
Compare
8b189f04
...
8b653c6a
Subproject commit 8b
189f04af150c9f2360eb693b4ef8f3dc3f94d4
Subproject commit 8b
653c6abc94fb9bc2a582402e46d6dfaaddcd3c
fairchat/fairchat.pro
View file @
f4ce25e3
...
...
@@ -24,7 +24,7 @@ else:unix: PRE_TARGETDEPS += $$OUT_PWD/../engine/libengine.a
TARGET
=
fairchat
VER_MAJ
=
1
VER_MIN
=
0
VER_PAT
=
0
VER_PAT
=
1
VERSION
=
$$
sprintf
(
"%1.%2.%3"
,
$$
VER_MAJ
,
$$
VER_MIN
,
$$
VER_PAT
)
DEFINES
+=
VERSION
=
\\\
"$$VERSION\\\"
...
...
fairchat/qml/pages/ServerSelectionPage.qml
View file @
f4ce25e3
...
...
@@ -116,7 +116,7 @@ Page {
anchors.right
:
parent
.
right
flat
:
true
anchors.verticalCenter
:
parent
.
verticalCenter
visible
:
!
(
model
.
domain
===
"
fairchat.net
"
)
visible
:
!
(
model
.
domain
===
"
fairchat.net
"
||
model
.
domain
===
"
demo.rocket.chat
"
)
}
}
Rectangle
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment