MISP
/
misp-bump
mirror of https://github.com/MISP/misp-bump
2
0
Fork 0
Code Issues Releases Wiki Activity
109 Commits
3 Branches
0 Tags
51 MiB
Commit Graph

109 Commits (814addc27c6d589f6298271c792496e1e1c59468)

Author SHA1 Message Date
Felix Prahl-Kamps 3b343e3cd9 Merge branch '1-patch-master' into 'master' 
Resolve "Connect with MISP"

Closes #1

See merge request its-wg/overview/overview-ubo/misp-auth!1
 2018-04-22 02:01:21 +02:00
Felix Prahl-Kamps 80b58bc77f Merge branch 'master' into '1-patch-master' 
# Conflicts:
#   .idea/assetWizardSettings.xml
#   .idea/modules.xml
#   app/build.gradle
#   app/src/main/AndroidManifest.xml
#   app/src/main/res/layout/activity_main.xml
#   app/src/main/res/values/colors.xml
#   app/src/main/res/values/strings.xml
#   app/src/main/res/values/styles.xml
#   build.gradle
#   gradle.properties
#   gradle/wrapper/gradle-wrapper.properties
 2018-04-22 02:00:45 +02:00
Felix Prahl-Kamps babaf2cd81 Initial commit 2018-04-22 01:50:05 +02:00
Felix Prahl-Kamps d85f0a61dd material design guidline is a JOKE 2018-04-04 03:13:46 +02:00
Felix Prahl-Kamps df4d2ab153 .gitignore is now working 2018-04-03 20:00:45 +02:00
Felix Prahl-Kamps 41243e08db gitignore 2018-04-03 19:57:23 +02:00
Felix Prahl-Kamps 5ddb12b416 added gitignore 2018-04-03 18:53:32 +02:00
Felix Prahl-Kamps d8536da51b added readme 2018-04-03 18:37:17 +02:00
Felix Prahl-Kamps 613cbf9f72 Initial commit 2018-04-03 18:17:38 +02:00