Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Patch 1 #3013

Closed
wants to merge 8 commits into from
Closed

Patch 1 #3013

wants to merge 8 commits into from

Conversation

mnemonicly
Copy link
Contributor

@mnemonicly mnemonicly commented Dec 4, 2016 •
edited
Loading

Fixes #2985.

snipe and others added 8 commits December 1, 2016 05:55
@snipe
Ignore npm log
b4653df
@snipe
Bumped version
521f4fa
@snipe
More graceful error message if log doesn’t exist
d49a1ea
@snipe
Merge remote-tracking branch 'origin/develop'
4df53bd 
# Conflicts:
#	config/version.php
#	resources/views/account/view-assets.blade.php
@snipe
Bumped version
4049143
@snipe
Merge remote-tracking branch 'origin/develop'
1afef94 
# Conflicts:
#	config/version.php
@snipe
Set DB_SSL to false for config
2afcfcc
@mnemonicly
Fix snipe#2895
ec280de 
Fixes the ajax store/create of asset models after the note->notes rename.
@mnemonicly mnemonicly closed this Dec 4, 2016
@mnemonicly mnemonicly deleted the patch-1 branch December 24, 2016 16:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mnemonicly @snipe