Skip to content

Commit 4c30576

Browse files
authored
Merge pull request #1 from FusionIIIT/master
Pull this
2 parents 1edc542 + 1fd45cf commit 4c30576

File tree

489 files changed

+4694
-15185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

489 files changed

+4694
-15185
lines changed

.gitignore

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,12 @@ celerybeat-schedule
5353
# dotenv
5454
.env
5555

56-
# virtualenv
57-
venv/
58-
ENV/
56+
# virtualenv: ignore environment folder ending with env. e.g. env, venv, myenv, fusionenv, etc
57+
*env/
5958

6059
# Rope project settings
6160
.ropeproject
6261

63-
# Ignore idea files
64-
.idea
65-
6662
# VSCode Settings
6763
.vscode/settings.json
6864

@@ -71,5 +67,3 @@ node_modules/
7167

7268
FusionIIIT/static/
7369
package-lock.json
74-
75-
!.idea

.idea/.gitignore

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/Fusion.iml

Lines changed: 31 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/dataSources.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/profiles_settings.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Django_Lib.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

FusionIIIT/Fusion/routing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from channels.routing import route
1+
#from channels.routing import route
22
#from notification_channels.consumers import add, disconnect, message
33

44
channel_routing = [

0 commit comments

Comments
 (0)