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
hds
flexin
android-app
Commits
3cb1c8ce
Commit
3cb1c8ce
authored
Feb 19, 2018
by
Nastuzzi Samy
Browse files
Merge branch 'HEAD' into develop
parents
ca711789
9ba3050c
Changes
7
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
3cb1c8ce
...
...
@@ -13,4 +13,5 @@ app/src/main/java/fr/utc/simde/payutc/admin rights
app/src/main/java/fr/utc/simde/payutc/full rights
app/src/main/java/fr/utc/simde/payutc/no rights
.gitignore
\ No newline at end of file
.gitignore
*.jks
.idea/misc.xml
View file @
3cb1c8ce
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"NullableNotNullManager"
>
<option
name=
"myDefaultNullable"
value=
"android.support.annotation.Nullable"
/>
<option
name=
"myDefaultNotNull"
value=
"android.support.annotation.NonNull"
/>
<option
name=
"myNullables"
>
<value>
<list
size=
"4"
>
<item
index=
"0"
class=
"java.lang.String"
itemvalue=
"org.jetbrains.annotations.Nullable"
/>
<item
index=
"1"
class=
"java.lang.String"
itemvalue=
"javax.annotation.Nullable"
/>
<item
index=
"2"
class=
"java.lang.String"
itemvalue=
"edu.umd.cs.findbugs.annotations.Nullable"
/>
<item
index=
"3"
class=
"java.lang.String"
itemvalue=
"android.support.annotation.Nullable"
/>
</list>
</value>
</option>
<option
name=
"myNotNulls"
>
<value>
<list
size=
"4"
>
<item
index=
"0"
class=
"java.lang.String"
itemvalue=
"org.jetbrains.annotations.NotNull"
/>
<item
index=
"1"
class=
"java.lang.String"
itemvalue=
"javax.annotation.Nonnull"
/>
<item
index=
"2"
class=
"java.lang.String"
itemvalue=
"edu.umd.cs.findbugs.annotations.NonNull"
/>
<item
index=
"3"
class=
"java.lang.String"
itemvalue=
"android.support.annotation.NonNull"
/>
</list>
</value>
</option>
</component>
<component
name=
"ProjectRootManager"
version=
"2"
languageLevel=
"JDK_1_7"
default=
"true"
project-jdk-name=
"1.8"
project-jdk-type=
"JavaSDK"
>
<component
name=
"ProjectRootManager"
version=
"2"
languageLevel=
"JDK_1_7"
project-jdk-name=
"1.8"
project-jdk-type=
"JavaSDK"
>
<output
url=
"file://$PROJECT_DIR$/build/classes"
/>
</component>
<component
name=
"ProjectType"
>
...
...
app/src/main/res/mipmap-hdpi/Thumbs.db
deleted
100644 → 0
View file @
ca711789
File deleted
app/src/main/res/mipmap-mdpi/Thumbs.db
deleted
100644 → 0
View file @
ca711789
File deleted
app/src/main/res/mipmap-xhdpi/Thumbs.db
deleted
100644 → 0
View file @
ca711789
File deleted
app/src/main/res/mipmap-xxhdpi/Thumbs.db
deleted
100644 → 0
View file @
ca711789
File deleted
app/src/main/res/mipmap-xxxhdpi/Thumbs.db
deleted
100644 → 0
View file @
ca711789
File deleted
Write
Preview
Markdown
is supported
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