Commit Graph

13 Commits

Author SHA1 Message Date
Jesse Plamondon-Willard 57d9d28554 Merge remote-tracking branch 'dewdrop/master' into feature/update-check-api (#336)
# Conflicts:
#	.gitignore
2017-09-21 23:34:52 -04:00
James Stine 06ed54b2c6 First commit. 2017-08-13 17:44:00 -04:00
Jesse Plamondon-Willard e8825947ca fix crlf 2017-01-16 16:10:50 -05:00
Zoryn Aaron b225568b59 do ignore packages I derped 2016-03-20 15:49:36 -04:00
Zoryn Aaron 2be0c20ff7 don't ignore packages what's wrong with you 2016-03-20 15:47:50 -04:00
Zoryn Aaron c50891a093 Zoryn returns. Added JSON. Added Config.cs. 2016-03-20 15:43:31 -04:00
ClxS f77e922ad0 Merged Zoryn4163/master into master 2016-03-03 20:17:40 +00:00
Zoryn 9a1b910ea3 resync for merge conflicts 2016-03-03 15:06:25 -05:00
ClxS d3f0e00db9 Updated gitignore to ignore C# and VS files 2016-03-03 19:56:54 +00:00
Zoryn eee4e9c0fe updates to change working location 2016-03-03 14:01:32 -05:00
Zoryn Aaron 57bc4aa552 commands
im tired
2016-02-29 05:21:45 -05:00
Zoryn Aaron a9955e0a73 binaries 2016-02-28 16:15:53 -05:00
Zoryn Aaron ca4706f53d ignore binaries 2016-02-28 14:41:31 -05:00