summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authornico <nico@magicbroccoli.de>2018-11-11 03:12:11 +0100
committernico <nico@magicbroccoli.de>2018-11-11 03:13:33 +0100
commit69951bba37a85cf7527d08861ab1f2715576df49 (patch)
tree3798538b14cc67e7deed4adc44957b4cc4607019 /.gitignore
parent6bb9f1d5b87537ed6bccf0dd6efb7b80c6a81395 (diff)
parent1b13bdfd926e394cab2a2edd15ecabf0afcc4cf2 (diff)
Merge branch 'dev'
+ added more comments to xep requests + added opt_arg to version, xep and contact + implemented data dictionary to hold all data in main bot + added message_ids * updated gitignore file * partly reworked servercontact implementation * complete rework of uptime, version * part rework of xep requests * complete rework of validate function * updated HandleError function * part rework of StaticStrings function * complete rework of queue building and deduplication * logging parameter fix
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 103d4a6..6391a21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,6 +60,6 @@ target/
# .idea
.idea
-.etag
bot\.cfg
-xeplist.xml
+common/xeplist.xml
+common/.etag \ No newline at end of file